diff --git a/scripts/install.sh b/scripts/install.sh
index fd72c5f..e5fcb6e 100755
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -102,7 +102,7 @@ echo "Backing up previous installation"
 
 echo "Cleaning up installation directory ..."
 rm ~/.resh/bin/* 2>/dev/null ||:
-rm ~/.resh/* 2>/dev/null 2>/dev/null ||:
+rm ~/.resh/* 2>/dev/null ||:
 # TODO: put this behind version condition
 # backward compatibility: We have a new location for resh history file 
 [ ! -f ~/.resh/history.json ] || mv ~/.resh/history.json ~/.resh_history.json 
@@ -129,10 +129,6 @@ cp -f scripts/shellrc.sh ~/.resh/shellrc
 cp -f scripts/reshctl.sh scripts/widgets.sh scripts/hooks.sh scripts/util.sh ~/.resh/
 cp -f scripts/rawinstall.sh ~/.resh/
 
-echo "Generating completions ..."
-bin/resh-control completion bash > ~/.resh/bash_completion.d/_reshctl
-bin/resh-control completion zsh > ~/.resh/zsh_completion.d/_reshctl
-
 echo "Copying more files ..."
 cp -f scripts/uuid.sh ~/.resh/bin/resh-uuid
 cp -f bin/resh-{daemon,cli,control,collect,postcollect,session-init,config} ~/.resh/bin/
@@ -160,6 +156,7 @@ fi
 # [ ! -e ~/.zcompdump ] || rm ~/.zcompdump
 
 # Final touch
+# TODO: change
 touch ~/.resh_history.json
 
 # Generating resh-uuid ...
@@ -203,16 +200,16 @@ RESH SEARCH APPLICATION = Redesigned reverse search that actually works
     Host, directories, git remote, and exit status is used to display relevant results first.
 
     At first, the search application will use the standard shell history without context. 
-    All history recorded from now on will have context which will by the RESH SEARCH app.
+    All history recorded from now on will have context which will be used by the RESH SEARCH app.
 
 CHECK FOR UPDATES
     To check for (and install) updates use reshctl command:
      $ reshctl update
 
 HISTORY
-    Your resh history will be recorded to '~/.resh_history.json'
+    Your resh history will be recorded to '${XDG_DATA_HOME-~/.local/share}/resh/history/<device>.reshjson'
     Look at it using e.g. following command (you might need to install jq)
-     $ cat ~/.resh_history.json | sed 's/^v[^{]*{/{/' | jq .
+     $ cat ${XDG_DATA_HOME-~/.local/share}/resh/history/<device>.reshjson | sed 's/^v[^{]*{/{/' | jq .
 
 ISSUES & FEEDBACK
     Please report issues to: https://github.com/curusarn/resh/issues
@@ -237,7 +234,7 @@ echo "All done!"
 echo "Thank you for using RESH"
 echo "Issues go here: https://github.com/curusarn/resh/issues"
 echo "Ctrl+R launches the RESH SEARCH app"
-# echo "Do not forget to restart your terminal"
+
 if [ -z "${__RESH_VERSION:-}" ]; then echo "
 ##############################################################
 #                                                            #