diff --git a/emacs/.emacs b/emacs/.emacs
index ab3e03a..f1ec0f1 100644
--- a/emacs/.emacs
+++ b/emacs/.emacs
@@ -29,9 +29,6 @@
 ;; Disable backup
 (setq make-backup-files nil)
 
-;; Treat underscore as part of word
-(modify-syntax-entry ?_ "w")
-
 (push '("melpa" . "http://melpa.milkbox.net/packages/") package-archives)
 
 (custom-set-variables
@@ -69,7 +66,8 @@
  '(shell-pop-window-size 20)
  '(tool-bar-mode nil)
  '(dired-listing-switches "-lh")
- '(ac-ignore-case nil))
+ '(ac-ignore-case nil)
+ '(show-trailing-whitespace t))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
@@ -174,7 +172,8 @@
 						   ac-source-symbols
 						   ac-source-features
 						   ac-source-words-in-all-buffer
-						   ac-source-dictionary))))
+						   ac-source-dictionary))
+        (global-auto-complete-mode)))
 
 ;; ivy
 (use-package ivy
@@ -348,6 +347,12 @@
 			    (set-input-method "latex-german")
 			    (local-set-key "\"" 'self-insert-command)))
 
+;; Treat _ as part of word in some modes
+(defun treat-underscore ()
+  (modify-syntax-entry ?_ "w"))
+
+(add-hook 'cperl-mode-hook 'treat-underscore)
+
 ;; Split windows horizontally preferred
 (setq split-height-threshold 6)
 (setq split-width-threshold 20)
diff --git a/vim/.vimrc b/vim/.vimrc
index 50e4ad3..07596bc 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -205,9 +205,9 @@ nnoremap <silent> <leader>t :g/TODO/<cr>
 nnoremap <silent> <C-G> :TigStatus<CR>
 " 0 should find first non blank
 nmap 0 ^
-" Easy buffer switching
-nnoremap <silent> M :bnext<cr>
-nnoremap <silent> N :bprev<cr>
+" " Easy buffer switching
+" nnoremap <silent> M :bnext<cr>
+" nnoremap <silent> N :bprev<cr>
 " Moving through windows
 nnoremap <silent> <C-l> <C-w>l
 nnoremap <silent> <C-h> <C-w>h
@@ -217,7 +217,6 @@ inoremap <silent> <C-l> <Esc><C-w>l
 inoremap <silent> <C-h> <Esc><C-w>h
 inoremap <silent> <C-j> <Esc><C-w>j
 inoremap <silent> <C-k> <Esc><C-w>k
-nnoremap K :q<cr>
 " Quick macroing
 nnoremap Q @@
 " --- Don't need a help