diff --git a/scripts/insert-pass.sh b/scripts/insert-pass.sh
index 50bf850..887d351 100644
--- a/scripts/insert-pass.sh
+++ b/scripts/insert-pass.sh
@@ -22,42 +22,33 @@ username="$(rofi -dmenu -i -p "Username")"
 [ -d "$page" ] && [ -e "$page$username.gpg" ] && notify-send "Account already \
 exists" && exit 1
 
-# mkdir $HOME/.username-store 2> /dev/null
-
-# dir=""
-# while [ -n "$( printf "%b\n" "$page" | grep "/" )" ]; do
-#     dir="$dir$(printf "%b\n" "$page" | sed "s|/.*$||")/"
-#     mkdir $HOME/.username-store/$dir 2> /dev/null
-#     page="$(printf "%b\n" "$page" | sed "s|^[^/]*/||")"
-# done
-
-# printf "%b\n" "$username" > $HOME/.username-store/$dir$page
-
 comments="$(printf "%b\n" "Yes\nNo" | rofi -dmenu -i -p "Comments?")"
 
-[ -z $(printf "%b\n" "$comments" | grep -E "(Yes|No)") ] && exit 0
+[ -z "$(printf "%b\n" "$comments" | grep -E "(Yes|No)")" ] && exit 0
 
 generate="$(printf "%b\n" "Yes\nNo" | rofi -dmenu -i -p "Generate password?")"
 
-[ -z $(printf "%b\n" "$generate" | grep -E "(Yes|No)") ] && exit 0
+[ -z "$(printf "%b\n" "$generate" | grep -E "(Yes|No)")" ] && exit 0
 
 contents="login: $username"
 if [ "$generate" = "Yes" ]; then
     contents="$(pwgen -ysBv 15 -N 1)\n$contents"
     if [ "$comments" = "Yes" ]; then
         file="/tmp/comments$(date +%s)"
-        $TSCRIPTS/run-on-terminal.sh $EDITOR $file
-        # [ -z "${TERMINAL##*termite*}" ] && $TERMINAL -e "$EDITOR \"$file\"" \
-        #     || $TERMINAL -e $EDITOR "$file"
-        [ -z "$(cat $file)" ] && notify-send "Operation CANCELLED" && exit 1
+        dash $TSCRIPTS/run-on-terminal.sh $EDITOR $file
+        [ ! -f "$file" -o -z "$(cat "$file")" ] && notify-send "Operation CANCELLED" && exit 1
         contents="$contents\ncomments: $(cat "$file")"
         rm "$file"
     fi
     
-    [ -f "$page.gpg" ] && mkdir "$page" && \
-        olduser="$(dash $SCRIPTS/get-pass-username.sh --print \
-            "$page_relative")" && mv "$page.gpg" "$page/$olduser.gpg"
+    if [ -f "$page.gpg" ]; then
+        mkdir "$page"
+        olduser="$(dash $SCRIPTS/get-pass-username.sh --print "$page_relative")"
+        mv "$page.gpg" "$page/$olduser.gpg"
+    fi
+
     [ -d "$page" ] && page_relative="$page_relative/$username"
+
     printf "%b\n" "$contents" | pass insert -m "$page_relative" || \
         (notify-send "Already exists" && exit 1)
 else
@@ -74,20 +65,20 @@ else
     contents="$passwd\n$contents"
     if [ "$comments" = "Yes" ]; then
         file="/tmp/comments$(date +%s)"
-        $TSCRIPTS/run-on-terminal.sh $EDITOR $file
-        # [ -z "${TERMINAL##*termite*}" ] && $TERMINAL -e "$EDITOR \"$file\"" \
-        #     || $TERMINAL -e $EDITOR "$file"
+        dash $TSCRIPTS/run-on-terminal.sh $EDITOR $file
+        [ ! -f "$file" -o -z "$(cat "$file")" ] && notify-send "Operation CANCELLED" && exit 1
         contents="$contents\ncomments: $(cat "$file")"
-        [ -z "$(cat $file)" ] && notify-send "Operation CANCELLED" && exit 1
         rm "$file"
     fi
-    [ -f "$page.gpg" ] && mkdir "$page" && \
-        olduser="$(dash $SCRIPTS/get-pass-username.sh --print \
-            "$page_relative")" && mv "$page.gpg" "$page/$olduser.gpg"
+
+    if [ -f "$page.gpg" ]; then
+        mkdir "$page"
+        olduser="$(dash $SCRIPTS/get-pass-username.sh --print "$page_relative")"
+        mv "$page.gpg" "$page/$olduser.gpg"
+    fi
+
     [ -d "$page" ] && page_relative="$page_relative/$username"
+
     printf "%b\n" "$contents" | pass insert -m "$page_relative" || \
         (notify-send "Already exists" && exit 1)
-    # dir="$(printf "%b\n" "$page" | sed "s|[^/]*$||")"
-    # page="$(printf "%b\n" "$page" | sed "s|^.*/||")"
-    # printf "%b\n" "$username" > "$PASSWORD_STORE_DIR/$dir.$page.user"
 fi
diff --git a/scripts/yt-search.sh b/scripts/yt-search.sh
index 8c8b6f0..44eaac2 100644
--- a/scripts/yt-search.sh
+++ b/scripts/yt-search.sh
@@ -2,10 +2,14 @@
 
 search="$(rofi -dmenu)"
 
-id="$(youtube-dl --get-id "ytsearch:$search")"
+if [ -n "$search" ]; then
 
-link="https://invidio.us/watch?v=$id"
+    id="$(youtube-dl --get-id "ytsearch:$search")"
 
-mpv "$link" 1>&2
+    link="https://invidio.us/watch?v=$id"
 
-printf "%b\n" "$link"
+    mpv "$link" 1>&2
+
+    printf "%b\n" "$link"
+
+fi
diff --git a/termscripts/play-videos-from-file.sh b/termscripts/play-videos-from-file.sh
index 03629b3..df47244 100644
--- a/termscripts/play-videos-from-file.sh
+++ b/termscripts/play-videos-from-file.sh
@@ -13,7 +13,7 @@ do
 
     mpv "$video"
 
-    length="$(wc -l "$1")"
+    length="$(wc -l "$1" | awk '{print $1}')"
     if [ "$length" -eq "$current_video" ]; then
         sleep 5m
     fi