diff --git a/tunnelkeeper b/tunnelkeeper
index 5a617cf..7f9fbee 100755
--- a/tunnelkeeper
+++ b/tunnelkeeper
@@ -43,9 +43,7 @@ case "$1" in
   FORKKILL ) kill $(sudo netstat -tnlp | grep "127.0.0.1:${2}" | grep -o '[0-9]*/ssh' | grep -o '[0-9]*') &>/dev/null ;;
   FORKDEL ) rm "$BASEDIR/var/${2}.connected" ;;
   start)
-    if [[ -e "$BASEDIR/var/tunnelkeeper.pid" ]]; then
-      exit
-    fi
+    [[ -e "$BASEDIR/var/tunnelkeeper.pid" ]] && exit
     echo $$ > "$BASEDIR/var/tunnelkeeper.pid"
     cat "$CONFFILE" | awk '/^Host / {print $2}' | xargs -I% -P0 $0 FORKSTART % &
   ;;
@@ -59,13 +57,14 @@ case "$1" in
     ruroot
     mkdir -p /opt/tunnelkeeper/var
     mkdir -p /opt/tunnelkeeper/etc
-    if [[ -f "$BASEDIR/etc/tunnels.conf" ]]; then
-      cp "$BASEDIR/etc/tunnels.conf" /opt/tunnelkeeper/etc
+    if [[ "$BASEDIR" != '/opt/tunnelkeeper/' ]]; then
+      cp -n "$BASEDIR/etc/tunnels.conf" /opt/tunnelkeeper/etc
+      cp "$BASEDIR/etc/tunnels.conf.example" /opt/tunnelkeeper/etc
+      cp "$REALPATH" "/opt/tunnelkeeper/tunnelkeeper"
     fi
-    cp "$REALPATH" "/opt/tunnelkeeper/tunnelkeeper"
     ln -f -s /opt/tunnelkeeper/tunnelkeeper /usr/local/bin/tunnelkeeper
     echo "[Unit]
-Description=TunnelKeeper keeps SSH tunnels open.
+Description=TunnelKeeper SSH tunnel utility.
 After=network.target
 [Service]
 User=root
@@ -83,9 +82,9 @@ WantedBy=multi-user.target" > /lib/systemd/system/tunnelkeeper.service
   ;;
   uninstall )
     ruroot
+    systemctl disable tunnelkeeper.service
     rm /usr/local/bin/tunnelkeeper
     rm /lib/systemd/system/tunnelkeeper.service
-    systemctl enable tunnelkeeper.service
     systemctl daemon-reload
     rm -rf /opt/tunnelkeeper
     echo -e "\nTunnelKeeper service uninstalled.\n"