diff --git a/header.sh b/header.sh
index 5d4a8c4..7f582a6 100644
--- a/header.sh
+++ b/header.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 PROD_STR="Simple Note System"
-VER_STR="v2.0a6"
+VER_STR="v2.0a7"
 
 cat << EOF
 #!/bin/bash
diff --git a/sns.sh b/sns.sh
index e7f57bc..7f07f64 100755
--- a/sns.sh
+++ b/sns.sh
@@ -76,7 +76,7 @@ function encrypt(){
 # output file, "$NOTE", will encrypt $TARGET to $NOTE against $PUBKEY's private
 # GPG key.
 
-gpg -r "$PUBKEY" -o "$NOTE" -e "$TARGET"
+    gpg -r "$PUBKEY" -o "$NOTE" -e "$TARGET"
 
 }
 
@@ -85,9 +85,7 @@ function decrypt(){
 # output file, "$NOTE", will decrpyt $TARGET to $NOTE against $PUBKEY's private
 # GPG key.
 
-    if [ ! -d "$ROOT_DIR"/tmp ]; then mkdir "$ROOT_DIR"/tmp; fi
-    TARGET="$TMP_DIR/$RANDOM"
-    gpg -d "$NOTE" > "$TARGET"
+    gpg -d "$NOTE"
 }
 function create(){
     if [ -e "$NOTE" ]; then
@@ -133,7 +131,8 @@ fi
 
 if [ "$ENCRYPTION" == "TRUE" ]; then
     cp "$NOTE" "$NOTE".bk
-    decrypt
+    if [ ! -d "$ROOT_DIR"/tmp ]; then mkdir "$ROOT_DIR"/tmp; fi
+    decrypt > "$TMP_DIR/$RANDOM"
 else TARGET="$NOTE"; fi
 
 
@@ -146,58 +145,26 @@ if [ "$ENCRYPTION" == "TRUE" ]; then
     encrypt;
     if [ -r "$NOTE" ]; then rm "$NOTE".bk;  fi
 fi
-
-
-
 }
 function print(){
-    if [ "$PRINT" == "TRUE" ]; then
-        if [ -r "$NOTE" ] || [ -r "${NOTE%.*}" ]; then
-            if [ -z "$CREATE" ]; then
-                if [ "$ENCRYPTION" == "TRUE" ]; then
-                    openssl enc -d -aes-256-cbc -in "${NOTE%.*}" -pass pass:"$ENC_KEY"
-                else
-                cat "$NOTE"
-                echo "" >> "$NOTE"
-                fi
+    if [ -r "$NOTE" ]; then
+        if [ -z "$CREATE" ]; then
+            if [ "$ENCRYPTION" == "TRUE" ]; then
+                decrypt
             else
-                echo ""
-                echo "ERROR: Note cannot be found."
-                echo ""
-
+                cat "$NOTE"
             fi
+        else
+            printf "\nERROR: Note cannot be found.\n"
         fi
     fi
 }
 function list(){
     if [ -d "$BASE_DIR"/"$NOTEBOOK" ]; then
-        printf "\nNotes in %s:\n" "$(basename "$NOTEBOOK")"
-
-        NOTES=(
-            $(find "$BASE_DIR"/"$NOTEBOOK" -name "*.$EXT" -print0 |\
-                sed s:"$BASE_DIR"/"$NOTEBOOK"/: "    " :g |\
-                sed -e s:".$EXT"::g | tr "/" " ")
-        )
-        let i=0
-        for NOTE in "${NOTES[@]}"; do
-            if [ -d "$BASE_DIR"/"$NOTEBOOK"/"$NOTE" ]; then
-                if [ "$LAST_SECTION" != "$NOTE" ]; then
-                    printf "  Section: %s\n" "$NOTE"
-                fi
-                LAST_SECTION="$NOTE"
-            else
-                #if [ $(($i % 1)) -eq 0 ]; then
-                #    printf "\n     "
-                #fi
-                printf "    %s\n" "$NOTE"
-            fi
-            let i++
+        printf "+%s\n" "$NOTEBOOK"
+        find "$BASE_DIR"/"$NOTEBOOK" -type f | while read NOTE; do
+            printf " -%s\n" "$(basename $NOTE | cut -d . -f 1)"
         done
-        printf "\n"
-    else
-        echo ""
-        echo "ERROR: Notebook $NOTEBOOK does not exist."
-        echo ""
     fi
 }
 # End Section: Functions
diff --git a/src/includes/edit.sns.sh b/src/includes/edit.sns.sh
index 64014d6..c260f8d 100644
--- a/src/includes/edit.sns.sh
+++ b/src/includes/edit.sns.sh
@@ -6,7 +6,8 @@ fi
 
 if [ "$ENCRYPTION" == "TRUE" ]; then
     cp "$NOTE" "$NOTE".bk
-    decrypt
+    if [ ! -d "$ROOT_DIR"/tmp ]; then mkdir "$ROOT_DIR"/tmp; fi
+    decrypt > "$TMP_DIR/$RANDOM"
 else TARGET="$NOTE"; fi
 
 
@@ -19,7 +20,4 @@ if [ "$ENCRYPTION" == "TRUE" ]; then
     encrypt;
     if [ -r "$NOTE" ]; then rm "$NOTE".bk;  fi
 fi
-
-
-
 }
diff --git a/src/includes/libencryption.sh b/src/includes/libencryption.sh
index a6fcec7..265c331 100644
--- a/src/includes/libencryption.sh
+++ b/src/includes/libencryption.sh
@@ -3,7 +3,7 @@ function encrypt(){
 # output file, "$NOTE", will encrypt $TARGET to $NOTE against $PUBKEY's private
 # GPG key.
 
-gpg -r "$PUBKEY" -o "$NOTE" -e "$TARGET"
+    gpg -r "$PUBKEY" -o "$NOTE" -e "$TARGET"
 
 }
 
@@ -12,7 +12,5 @@ function decrypt(){
 # output file, "$NOTE", will decrpyt $TARGET to $NOTE against $PUBKEY's private
 # GPG key.
 
-    if [ ! -d "$ROOT_DIR"/tmp ]; then mkdir "$ROOT_DIR"/tmp; fi
-    TARGET="$TMP_DIR/$RANDOM"
-    gpg -d "$NOTE" > "$TARGET"
+    gpg -d "$NOTE"
 }
diff --git a/src/includes/list.sns.sh b/src/includes/list.sns.sh
index 3224a0c..429203c 100644
--- a/src/includes/list.sns.sh
+++ b/src/includes/list.sns.sh
@@ -1,31 +1,8 @@
 function list(){
     if [ -d "$BASE_DIR"/"$NOTEBOOK" ]; then
-        printf "\nNotes in %s:\n" "$(basename "$NOTEBOOK")"
-
-        NOTES=(
-            $(find "$BASE_DIR"/"$NOTEBOOK" -name "*.$EXT" -print0 |\
-                sed s:"$BASE_DIR"/"$NOTEBOOK"/: "    " :g |\
-                sed -e s:".$EXT"::g | tr "/" " ")
-        )
-        let i=0
-        for NOTE in "${NOTES[@]}"; do
-            if [ -d "$BASE_DIR"/"$NOTEBOOK"/"$NOTE" ]; then
-                if [ "$LAST_SECTION" != "$NOTE" ]; then
-                    printf "  Section: %s\n" "$NOTE"
-                fi
-                LAST_SECTION="$NOTE"
-            else
-                #if [ $(($i % 1)) -eq 0 ]; then
-                #    printf "\n     "
-                #fi
-                printf "    %s\n" "$NOTE"
-            fi
-            let i++
+        printf "+%s\n" "$NOTEBOOK"
+        find "$BASE_DIR"/"$NOTEBOOK" -type f | while read NOTE; do
+            printf " -%s\n" "$(basename $NOTE | cut -d . -f 1)"
         done
-        printf "\n"
-    else
-        echo ""
-        echo "ERROR: Notebook $NOTEBOOK does not exist."
-        echo ""
     fi
 }
diff --git a/src/includes/print.sns.sh b/src/includes/print.sns.sh
index 6058435..a24cd2b 100644
--- a/src/includes/print.sns.sh
+++ b/src/includes/print.sns.sh
@@ -1,19 +1,13 @@
 function print(){
-    if [ "$PRINT" == "TRUE" ]; then
-        if [ -r "$NOTE" ] || [ -r "${NOTE%.*}" ]; then
-            if [ -z "$CREATE" ]; then
-                if [ "$ENCRYPTION" == "TRUE" ]; then
-                    openssl enc -d -aes-256-cbc -in "${NOTE%.*}" -pass pass:"$ENC_KEY"
-                else
-                cat "$NOTE"
-                echo "" >> "$NOTE"
-                fi
+    if [ -r "$NOTE" ]; then
+        if [ -z "$CREATE" ]; then
+            if [ "$ENCRYPTION" == "TRUE" ]; then
+                decrypt
             else
-                echo ""
-                echo "ERROR: Note cannot be found."
-                echo ""
-
+                cat "$NOTE"
             fi
+        else
+            printf "\nERROR: Note cannot be found.\n"
         fi
     fi
 }