diff --git a/.bashrc b/.bashrc
index f910684..8c9b13f 100644
--- a/.bashrc
+++ b/.bashrc
@@ -92,7 +92,3 @@ if ! shopt -oq posix; then
     . /etc/bash_completion
   fi
 fi
-
-# use vim as default editor
-export VISUAL=vim
-export EDITOR="$VISUAL"
diff --git a/initialize_script b/initialize_script
index bf6771c..0ad943c 100755
--- a/initialize_script
+++ b/initialize_script
@@ -14,22 +14,14 @@ function user_config {
     if [[ "$USER" == "user" ]]; then
         get_path
 	    mkdir $HOME/.vim
-        if [[ -a $HOME/.bashrc ]]; then
-            mv $HOME/.bashrc $HOME/.bashrc.old
-            echo "Old .bashrc moved to .bashrc.old"
-        fi
-        ln -s $SCRIPTPATH/{.bashrc,vim/.vimrc,tmux/.tmux.conf,.profile} $HOME/;
-        ln -s $SCRIPTPATH/vim/colors $HOME/.vim/
+        ln -sf $SCRIPTPATH/{.bashrc,vim/.vimrc,tmux/.tmux.conf,.profile} $HOME/;
+        ln -sf $SCRIPTPATH/vim/colors $HOME/.vim/
         echo 'Linking configuration files done'
     elif [[ "$USER" == "root" ]]; then
         get_path
 	    mkdir /root/.vim
-        if [[ -a $HOME/.bashrc ]]; then
-            mv /root/.bashrc /root/.bashrc.old
-            echo "Old .bashrc moved to .bashrc.old"
-        fi
-        ln -s $SCRIPTPATH/{.bashrc,vim/.vimrc,tmux/.tmux.conf,.profile} /root/
-        ln -s $SCRIPTPATH/vim/colors /root/.vim/
+        ln -sf $SCRIPTPATH/{.bashrc,vim/.vimrc,tmux/.tmux.conf,.profile} /root/
+        ln -sf $SCRIPTPATH/vim/colors /root/.vim/
         echo 'Linking configuration files done'
     else
         echo 'No selection was made'
diff --git a/scripts/create_container b/scripts/create_container
index 6a85fda..5aab939 100755
--- a/scripts/create_container
+++ b/scripts/create_container
@@ -18,7 +18,7 @@ config_ssh() {
 	sed -i 's/^#Port .*/Port '"$PORT"'/' $CONTAINER_PATH/etc/ssh/sshd_config
 	sed -i 's/^#PermitRootLogin .*/PermitRootLogin yes/' $CONTAINER_PATH/etc/ssh/sshd_config
 	sed -i 's/^#PubkeyAuthentication .*/PubkeyAuthentication yes/' $CONTAINER_PATH/etc/ssh/sshd_config
-	echo $SSHKEY >> $CONTAINER_PATH/root/.ssh/authorized_keys
+	cat $SSHKEY >> $CONTAINER_PATH/root/.ssh/authorized_keys
 }
 
 dotfiles() {
@@ -54,7 +54,7 @@ if [ -n "$HOSTNAME" ] ;then
 fi
 
 if [ "$SSH_SERVER" == "y" ] ;then
-	read -e -p  "Enter ssh key for ssh access: " SSHKEY
+	read -e -p  "Enter ssh key for container access: " SSHKEY
 	config_ssh
 fi