diff --git a/clipboard.sh b/clipboard.sh
index 9478d9e..fd2a3e3 100755
--- a/clipboard.sh
+++ b/clipboard.sh
@@ -13,11 +13,18 @@ fail="[\033[31m✗\033[0m]"
 
 
 copy () {
+    tput sc
+    echo "Copying $target to clipboard..."
+    if [ -z $target ] || ! [ -f $target ]; then
+        echo "$fail File not found"
+        exit
+    fi
+
     # Find the absolute path of the requested file or folder...
     path="$(cd "$(dirname -- "$target")" >/dev/null; pwd -P)/$(basename -- "$target")"
 
     if grep -sq "$path" $clipboardfile; then
-        echo "$fail \033[32m$target\033[0m already in clipboard"
+        echo "$fail \033[33;1m$target\033[0m already in clipboard"
         exit 0
     fi
 
@@ -32,9 +39,11 @@ copy () {
         number=0
     fi
     # Store the file location in the clipboard with the operation
-    cp $path "$clipboarddir/$number.tmp"
+    cp -r "$path" "$clipboarddir/$number.tmp"
     echo "copy:$number:$path" >> $clipboardfile
-    echo "Copied \033[33;1m$target\033[0m to clipboard"
+    tput rc
+    tput el
+    echo "$success Copied \033[33;1m$target\033[0m to clipboard"
 }
 
 ct () { # Cut
@@ -43,7 +52,7 @@ ct () { # Cut
 
 cl () { # Clear
     if [ -d "$clipboarddir" ]; then
-        rm -r $clipboarddir
+        rm -fr $clipboarddir
         echo "$success Clipboard cleared"
     else
         echo "$empty Clipboard already empty"
@@ -52,19 +61,38 @@ cl () { # Clear
 
 pt () {
     if [ -f $clipboardfile ]; then
-        file=$(tail -n 1 $clipboardfile | cut -d ':' -f3)
-        name=$(tail -n 1 $clipboardfile | rev | cut -d '/' -f1 | rev)
-        operation=$(tail -n 1 $clipboardfile | cut -d ':' -f1)
-        number=$(tail -n 1 $clipboardfile | cut -d ':' -f2)
+        if [ -z $target ]; then
+            file=$(tail -n 1 $clipboardfile | cut -d ':' -f3)
+            name=$(tail -n 1 $clipboardfile | rev | cut -d '/' -f1 | rev)
+            operation=$(tail -n 1 $clipboardfile | cut -d ':' -f1)
+            number=$(tail -n 1 $clipboardfile | cut -d ':' -f2)
+        elif [ $(cat "$clipboardfile" | wc -l) -ge $((target + 1)) ]; then
+            target=$((target + 1))
+            file=$(sed "${target}q;d" $clipboardfile | cut -d ':' -f3)
+            name=$(sed "${target}q;d" $clipboardfile | rev | cut -d '/' -f1 | rev)
+            operation=$(sed "${target}q;d" $clipboardfile | cut -d ':' -f1)
+            number=$(sed "${target}q;d" $clipboardfile | cut -d ':' -f2)
+        else
+            echo "$fail Invalid history line"
+            exit
+        fi
         if [ -f $name ]; then
             tput sc
             echo -n "\033[33;1m$name\033[0m already exists in this folder, do you want to overwrite?"
             read -p " y/N " yn
             case $yn in
-                [Yy]* ) echo cp -rf "$clipboarddir/$number.tmp" $name && tput rc;tput el; echo "$success Pasted \033[33;1m$name\033[0m";;
-                [Nn]* ) exit;;
-                * ) exit;;
+                [Yy]* ) overwrite=1;;
+                [Nn]* ) tput rc;tput el;echo "$fail Canceled"; exit;;
+                * ) tput rc;tput el;echo "$fail Canceled"; exit;;
             esac
+            if [ $overwrite -eq 1 ]; then
+                echo cp -rf "$clipboarddir/$number.tmp" $name
+                tput rc
+                tput el
+                echo "$success Pasted \033[33;1m$name\033[0m"
+            else
+                exit
+            fi
         else
             cp "$clipboarddir/$number.tmp" $name
             echo "$success Pasted \033[33;1m$name\033[0m"
@@ -77,7 +105,12 @@ pt () {
 
 show () {
     if [ -f $clipboardfile ]; then
-        cat $clipboardfile | rev | cut -d '/' -f1 | rev
+        echo "\033[35;1;4mClipboard History:\033[0m"
+        printf '%s\n' "$(tac $clipboardfile)" | while IFS= read -r line; do
+            filename=$(echo "$line" | rev | cut -d '/' -f1 | rev)
+            number=$(echo $line | cut -d ':' -f2)
+            echo "$number: $filename"
+        done
     else
         echo "$empty Clipboard empty"
     fi
@@ -93,6 +126,8 @@ elif [ "$op" = "clear" ]; then
     cl
 elif [ "$op" = "show" ]; then
     show
-else
+elif [ -z "$op" ]; then
     show
+else
+    echo "$fail Invalid argument"
 fi