diff --git a/src/bash-completion/sns b/src/bash-completion/sns
index 4a6cd7d..1ede6c3 100644
--- a/src/bash-completion/sns
+++ b/src/bash-completion/sns
@@ -22,7 +22,7 @@ _sns_complete_entries () {
 
 	local IFS=$'\n'
 	local items=($(compgen -f $prefix$cur))
-	for item in ${items[@]}; do
+	for item in "${items[@]}"; do
 		[[ $item =~ /\.[^/]*$ ]] && continue
 
 		# if there is a unique match, and it is a directory with one entry
@@ -56,7 +56,7 @@ _sns_complete_folders () {
 
 	local IFS=$'\n'
 	local items=($(compgen -d $prefix$cur))
-	for item in ${items[@]}; do
+	for item in "${items[@]}"; do
 		[[ $item == $prefix.* ]] && continue
 		COMPREPLY+=("${item#$prefix}/")
 	done
@@ -77,9 +77,10 @@ _sns()
 	if [[ $COMP_CWORD -gt 1 ]]; then
 		local lastarg="${COMP_WORDS[$COMP_CWORD-1]}"
 		case "${COMP_WORDS[1]}" in
-			--list)
+			--list|-l)
                 _sns_complete_folders
-            --edit|--print)
+				;;
+            --edit|-e|--print|-p|--delete|-d)
 				_sns_complete_entries
 				;;
             *)
diff --git a/src/main/stage3.sns.sh b/src/main/stage3.sns.sh
index 2880385..b090f4b 100644
--- a/src/main/stage3.sns.sh
+++ b/src/main/stage3.sns.sh
@@ -15,7 +15,7 @@ fi
 
 if [ "$ENCRYPTION" == "TRUE" ]; then
     SESSION_ID="$RANDOM" #SESSION_ID later becomes the temporary filename
-    readonly NOTE="$NOTE.$EXT.gpg"
+    readonly NOTE="$NOTE.gpg.$EXT"
 else
     readonly NOTE="$NOTE.$EXT"
 fi