diff --git a/herbstluftwm/autostart b/herbstluftwm/autostart
index d7c6a05..b537cde 100755
--- a/herbstluftwm/autostart
+++ b/herbstluftwm/autostart
@@ -27,15 +27,18 @@ if [[ "$HOST" == "atlantispc" ]]; then
     #hc detect_monitors
     hc set swap_monitors_to_get_tag 0
     hc set_monitors 3840x1080+0+0
-    xautolock -time 15 -locker /home/ik15ydit/.config/i3lock/piclock.sh &
 fi
 ### Atlantislaptop specific setup ###
 if [[ "$HOST" == "atlantislaptop" ]]; then
     hc keybind XF86MonBrightnessUp spawn /bin/bash -c 'tee /sys/class/backlight/intel_backlight/brightness <<< "$(expr $(cat /sys/class/backlight/intel_backlight/brightness) + 5)"' 
     hc keybind XF86MonBrightnessDown spawn /bin/bash -c 'tee /sys/class/backlight/intel_backlight/brightness <<< "$(expr $(cat /sys/class/backlight/intel_backlight/brightness) - 5)"'
-    xautolock -time 15 -locker /home/ik15ydit/.config/i3lock/piclock.sh &
     #/usr/bin/dunst & 
     hc keybind $Mod-o spawn /bin/bash -c "/home/ik15ydit/.config/i3lock/piclock.sh & systemctl hibernate"
+fi
+
+### Atlantis general
+if [[ ( "$HOST" == "atlantispc" ) || ( "$HOST" == "atlantislaptop" ) ]]; then
+    xautolock -time 15 -locker /home/ik15ydit/.config/i3lock/piclock.sh &
     hc keybind $Mod-c spawn /bin/bash -c "sudo stopvpn.sh; sudo /usr/bin/openvpn_cip.sh & ~/.config/herbstluftwm/hl_status_deamon.py --refresh"
     hc keybind $Mod-Shift-c spawn /bin/bash -c "sudo stopvpn.sh && ~/.config/herbstluftwm/hl_status_deamon.py --refresh"
 fi
diff --git a/other/package_list_full.txt b/other/package_list_full.txt
index 73b0560..45940db 100644
--- a/other/package_list_full.txt
+++ b/other/package_list_full.txt
@@ -68,6 +68,7 @@ traceroute      ;#tracert/check route to host
 tree            ;#show filesystemtree
 usbutils        ;#usefullshit for usbdevices
 vim-nox         ;#good consol texeditor with script support
+vim-python-jedi ;#python autocompletion
 wget            ;#download urls
 whois           ;#lookup ips etc of DNS adresses
 wicd-curses     ;#good simple networkmanager
diff --git a/vim/rc b/vim/rc
index 19d4fc5..ee78769 100644
--- a/vim/rc
+++ b/vim/rc
@@ -153,3 +153,8 @@ endif
 
 " use x11 primary selection for yanking (yes, "unnamed" is the key for that..)
 set clipboard=unnamed 
+
+
+" python-jedi config
+"let g:jedi#popup_on_dot = 0
+autocmd FileType python setlocal completeopt-=preview
diff --git a/zshrc b/zshrc
index da10e26..6e0ca03 100644
--- a/zshrc
+++ b/zshrc
@@ -168,6 +168,10 @@ alias cipra="xpra start ssh:ik15ydit@faui00n.cs.fau.de:100 --start-child urxvt"
 alias mountcip="sshfs ik15ydit@faui00n.cs.fau.de:/ -o reconnect,idmap=user $CIP_MOUNTPOINT"
 alias umountcip="fusermount -u $CIP_MOUNTPOINT"
 
+## CONNECT Locally ##
+alias -g atlantislaptop="ik15ydit@atlantislaptop.local"
+alias -g atlantismedion="ik15ydit@atlantismedion.local"
+
 ## DIRECT TO CONFIG ##
 alias hlconf="vim ~/.config/herbstluftwm/autostart"
 alias zshconf="vim ~/.zshrc"
@@ -258,3 +262,4 @@ bindkey ^R hhstest
 source ~/.config/other/zsh-history-substring-search.zsh
 bindkey '^[[5~' history-substring-search-up
 bindkey '^[[6~' history-substring-search-down
+alias genserverkey='openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -days 100000'