diff --git a/header.sh b/header.sh
index 7a591c0..6ba4564 100644
--- a/header.sh
+++ b/header.sh
@@ -15,7 +15,7 @@ if [ -z "\$HOME" ]; then HOME=/home/"\$(whoami)"; fi
 PROD_STR="$PROD_STR"
 readonly VER_STR="$VER_STR"
 readonly ROOT_DIR="\$HOME"/.config/xenlabs/sns
-readonly BASE_DIR="\$ROOT_DIR"/notes
+readonly NOTES_DIR="\$ROOT_DIR"/notes
 readonly TMP_DIR="\$ROOT_DIR"/tmp
 readonly CONFIG_FILE="\$ROOT_DIR/sns.conf"
 
diff --git a/sns.sh b/sns.sh
index 33cf6b0..4bbfa8c 100755
--- a/sns.sh
+++ b/sns.sh
@@ -1,15 +1,15 @@
 #!/bin/bash
 #==========================================================
-# Simple Note System, v2.0a7
+# Simple Note System, v2.0a8
 # Copyright 2014, Xenese Labs/Sicron-Perion XNF
 #==========================================================
 
 if [ -z "$HOME" ]; then HOME=/home/"$(whoami)"; fi
 
 PROD_STR="Simple Note System"
-readonly VER_STR="v2.0a7"
+readonly VER_STR="v2.0a8"
 readonly ROOT_DIR="$HOME"/.config/xenlabs/sns
-readonly BASE_DIR="$ROOT_DIR"/notes
+readonly NOTES_DIR="$ROOT_DIR"/notes
 readonly TMP_DIR="$ROOT_DIR"/tmp
 readonly CONFIG_FILE="$ROOT_DIR/sns.conf"
 
@@ -23,7 +23,7 @@ if [ ! -d "$TMP_DIR"  ]; then mkdir -p "$TMP_DIR" ; fi
 
 cat > "$CONFIG_FILE" << EOF
 #==========================================================
-# Simple Note System Config, v2.0a5
+# Simple Note System Config, v2.0a8
 # Copyright 2014, Xenese Labs/Sicron-Perion XNF
 #==========================================================
 
@@ -72,19 +72,18 @@ function p_header(){
     printf "TITLE: %s\nDATE: %s\n" "$NAME" "$(date)"
 }
 function encrypt(){
-# This function, given a recipient, $PUBKEY; a file to encrypt, $TARGET; and an
-# output file, "$NOTE", will encrypt $TARGET to $NOTE against $PUBKEY's private
+# This function, given a recipient, $PUBKEY; a file to encrypt, $TMP_NOTE; and an
+# output file, "$NOTE", will encrypt $TMP_NOTE to $NOTE against $PUBKEY's private
 # GPG key.
 
-    gpg -r "$PUBKEY" -o "$NOTE" -e "$TARGET"
+    gpg -r "$PUBKEY" -o "$NOTE" -e "$TMP_NOTE"
 
 }
 
 function decrypt(){
-# This function, given a recipient, $PUBKEY; a file to decrypt, $TARGET; and an
-# output file, "$NOTE", will decrpyt $TARGET to $NOTE against $PUBKEY's private
+# This function, given a recipient, $PUBKEY; a file to decrypt, $TMP_NOTE; and an
+# output file, "$NOTE", will decrpyt $TMP_NOTE to $NOTE against $PUBKEY's private
 # GPG key.
-    echo "$NOTE"; pause
     gpg -d "$NOTE"
 }
 function create(){
@@ -99,8 +98,8 @@ function create(){
         echo "TITLE: $NAME" > "$NOTE"
         echo "DATE: $(date)" >> "$NOTE"
     elif [ "$ENCRYPTION" == "TRUE" ]; then
-        TARGET="$TMP_DIR"/"$SESSION_ID"
-        p_header > "$TARGET"
+        TMP_NOTE="$TMP_DIR"/"$SESSION_ID"
+        p_header > "$TMP_NOTE"
         encrypt
     fi
 
@@ -132,14 +131,14 @@ fi
 if [ "$ENCRYPTION" == "TRUE" ]; then
     cp "$NOTE" "$NOTE".bk
     if [ ! -d "$ROOT_DIR"/tmp ]; then mkdir "$ROOT_DIR"/tmp; fi
-    TARGET="$TMP_DIR/$SESSION_ID"
-    decrypt > "$TARGET"
-else TARGET="$NOTE"; fi
+    TMP_NOTE="$TMP_DIR/$SESSION_ID"
+    decrypt > "$TMP_NOTE"
+else TMP_NOTE="$NOTE"; fi
 
 
-if [ -z "$CREATE" ]; then printf "\nEDIT %s" "$(date)" >> "$TARGET"; fi
+if [ -z "$CREATE" ]; then printf "\nEDIT %s" "$(date)" >> "$TMP_NOTE"; fi
 
-"$EDITOR" "$TARGET"
+"$EDITOR" "$TMP_NOTE"
 
 if [ "$ENCRYPTION" == "TRUE" ]; then
     rm "$NOTE"
@@ -161,9 +160,9 @@ function print(){
     fi
 }
 function list(){
-    if [ -d "$BASE_DIR"/"$NOTEBOOK" ]; then
+    if [ -d "$NOTES_DIR"/"$NOTEBOOK" ]; then
         printf "+%s\n" "$NOTEBOOK"
-        find "$BASE_DIR"/"$NOTEBOOK" -type f | while read -r NOTE; do
+        find "$NOTES_DIR"/"$NOTEBOOK" -type f | while read -r NOTE; do
             printf " -%s\n" "$(basename \"$NOTE\" | cut -d . -f 1 )"
         done
     fi
@@ -201,8 +200,8 @@ fi
 
 if [ "$ENCRYPTION" == "TRUE" ]; then
     PROD_STR="Simple Note System (Encryption Enabled)"
-    if [ ! -d "$BASE_DIR"/tmp ]; then
-        mkdir -p "$BASE_DIR"/tmp
+    if [ ! -d "$ROOT_DIR"/tmp ]; then
+        mkdir -p "$ROOT_DIR"/tmp
     fi
 fi
 
@@ -288,7 +287,7 @@ if [ -z "$NAME" ]; then
 fi
 
 SESSION_ID="$RANDOM"
-NOTE_DIR="$BASE_DIR"/"$NOTEBOOK"/"$SECTION"/
+NOTE_DIR="$NOTES_DIR"/"$NOTEBOOK"/"$SECTION"/
 
 
 if [ "$ENCRYPTION" == "TRUE" ]; then readonly NOTE="$NOTE_DIR""$NAME"."$EXT".gpg
diff --git a/src/includes/create.sns.sh b/src/includes/create.sns.sh
index 403eae1..54de245 100644
--- a/src/includes/create.sns.sh
+++ b/src/includes/create.sns.sh
@@ -10,8 +10,8 @@ function create(){
         echo "TITLE: $NAME" > "$NOTE"
         echo "DATE: $(date)" >> "$NOTE"
     elif [ "$ENCRYPTION" == "TRUE" ]; then
-        TARGET="$TMP_DIR"/"$SESSION_ID"
-        p_header > "$TARGET"
+        TMP_NOTE="$TMP_DIR"/"$SESSION_ID"
+        p_header > "$TMP_NOTE"
         encrypt
     fi
 
diff --git a/src/includes/edit.sns.sh b/src/includes/edit.sns.sh
index cc5e15f..e63c412 100644
--- a/src/includes/edit.sns.sh
+++ b/src/includes/edit.sns.sh
@@ -7,14 +7,14 @@ fi
 if [ "$ENCRYPTION" == "TRUE" ]; then
     cp "$NOTE" "$NOTE".bk
     if [ ! -d "$ROOT_DIR"/tmp ]; then mkdir "$ROOT_DIR"/tmp; fi
-    TARGET="$TMP_DIR/$SESSION_ID"
-    decrypt > "$TARGET"
-else TARGET="$NOTE"; fi
+    TMP_NOTE="$TMP_DIR/$SESSION_ID"
+    decrypt > "$TMP_NOTE"
+else TMP_NOTE="$NOTE"; fi
 
 
-if [ -z "$CREATE" ]; then printf "\nEDIT %s" "$(date)" >> "$TARGET"; fi
+if [ -z "$CREATE" ]; then printf "\nEDIT %s" "$(date)" >> "$TMP_NOTE"; fi
 
-"$EDITOR" "$TARGET"
+"$EDITOR" "$TMP_NOTE"
 
 if [ "$ENCRYPTION" == "TRUE" ]; then
     rm "$NOTE"
diff --git a/src/includes/libencryption.sh b/src/includes/libencryption.sh
index d87fb52..71b1181 100644
--- a/src/includes/libencryption.sh
+++ b/src/includes/libencryption.sh
@@ -1,16 +1,15 @@
 function encrypt(){
-# This function, given a recipient, $PUBKEY; a file to encrypt, $TARGET; and an
-# output file, "$NOTE", will encrypt $TARGET to $NOTE against $PUBKEY's private
+# This function, given a recipient, $PUBKEY; a file to encrypt, $TMP_NOTE; and an
+# output file, "$NOTE", will encrypt $TMP_NOTE to $NOTE against $PUBKEY's private
 # GPG key.
 
-    gpg -r "$PUBKEY" -o "$NOTE" -e "$TARGET"
+    gpg -r "$PUBKEY" -o "$NOTE" -e "$TMP_NOTE"
 
 }
 
 function decrypt(){
-# This function, given a recipient, $PUBKEY; a file to decrypt, $TARGET; and an
-# output file, "$NOTE", will decrpyt $TARGET to $NOTE against $PUBKEY's private
+# This function, given a recipient, $PUBKEY; a file to decrypt, $TMP_NOTE; and an
+# output file, "$NOTE", will decrpyt $TMP_NOTE to $NOTE against $PUBKEY's private
 # GPG key.
-    echo "$NOTE"; pause
     gpg -d "$NOTE"
 }
diff --git a/src/includes/list.sns.sh b/src/includes/list.sns.sh
index e4c75da..d65d4f7 100644
--- a/src/includes/list.sns.sh
+++ b/src/includes/list.sns.sh
@@ -1,7 +1,7 @@
 function list(){
-    if [ -d "$BASE_DIR"/"$NOTEBOOK" ]; then
+    if [ -d "$NOTES_DIR"/"$NOTEBOOK" ]; then
         printf "+%s\n" "$NOTEBOOK"
-        find "$BASE_DIR"/"$NOTEBOOK" -type f | while read -r NOTE; do
+        find "$NOTES_DIR"/"$NOTEBOOK" -type f | while read -r NOTE; do
             printf " -%s\n" "$(basename \"$NOTE\" | cut -d . -f 1 )"
         done
     fi
diff --git a/src/main/stage1.sns.sh b/src/main/stage1.sns.sh
index 4cb45f7..af57da1 100644
--- a/src/main/stage1.sns.sh
+++ b/src/main/stage1.sns.sh
@@ -20,8 +20,8 @@ fi
 
 if [ "$ENCRYPTION" == "TRUE" ]; then
     PROD_STR="Simple Note System (Encryption Enabled)"
-    if [ ! -d "$BASE_DIR"/tmp ]; then
-        mkdir -p "$BASE_DIR"/tmp
+    if [ ! -d "$ROOT_DIR"/tmp ]; then
+        mkdir -p "$ROOT_DIR"/tmp
     fi
 fi
 
diff --git a/src/main/stage3.sns.sh b/src/main/stage3.sns.sh
index d9a046b..da7f738 100644
--- a/src/main/stage3.sns.sh
+++ b/src/main/stage3.sns.sh
@@ -22,7 +22,7 @@ if [ -z "$NAME" ]; then
 fi
 
 SESSION_ID="$RANDOM"
-NOTE_DIR="$BASE_DIR"/"$NOTEBOOK"/"$SECTION"/
+NOTE_DIR="$NOTES_DIR"/"$NOTEBOOK"/"$SECTION"/
 
 
 if [ "$ENCRYPTION" == "TRUE" ]; then readonly NOTE="$NOTE_DIR""$NAME"."$EXT".gpg