diff --git a/init.el b/init.el
index ba3bbd3..9ffdb9f 100644
--- a/init.el
+++ b/init.el
@@ -126,6 +126,7 @@
   (which-func-modes '(prog-mode)))
 
 (global-so-long-mode +1)
+(global-visual-line-mode +1)
 
 (use-package visual-fill-column
   :if (package-installed-p 'visual-fill-column)
@@ -140,14 +141,10 @@
       split-width-threshold 160)
 
 (setq tab-always-indent 'complete
+      tab-first-completion 'word
       completion-cycle-threshold nil
       completions-detailed t)
 
-(add-to-list 'directory-abbrev-alist
-             '("^/ndrive" . "/smb:elitherl%ccfepc@msrv-cfshare.ccfepc.ccfe.ac.uk:/NDrive/"))
-(add-to-list 'directory-abbrev-alist
-             '("^/tdrive" . "/smb:elitherl%ccfepc@msrv-cfshare.ccfepc.ccfe.ac.uk:/NewT/"))
-
 (use-package tramp
   :defines (tramp-remote-path tramp-default-proxies-alist)
   :custom
@@ -161,7 +158,7 @@
   (add-to-list 'tramp-remote-path "~/.local/bin/")
   (add-to-list 'tramp-remote-path "~/bin")
   (add-to-list 'tramp-default-proxies-alist
-               '("legion" "\\`root\\'" "/ssh:%h:")))
+               '("legion" "\\`root\\'" "/sshx:%h:")))
 
 (connection-local-set-profile-variables
  'remote-no-corfu-auto