diff --git a/after/ftplugin/scala.vim b/after/ftplugin/scala.vim
index 287e4c2..1c1d496 100644
--- a/after/ftplugin/scala.vim
+++ b/after/ftplugin/scala.vim
@@ -11,3 +11,5 @@ noremap <Leader>ri :EnInline<CR>
 noremap K :EnDocBrowse<CR>
 
 noremap <Leader>f :Autoformat<CR>
+
+au BufWritePost *.scala Neomake!
diff --git a/init.vim b/init.vim
index 095040e..0a62092 100644
--- a/init.vim
+++ b/init.vim
@@ -48,6 +48,7 @@ set hidden
 set mouse=
 
 set cursorline
+set guicursor=
 
 set undofile
 set undodir=~/.local/share/nvim/undo
@@ -113,6 +114,9 @@ autocmd BufNewFile *.{h,hpp} call <SID>insert_gates()
 nnoremap <space> za
 vnoremap <silent> . :normal .<CR>
 
+nnoremap q: :q
+nnoremap <leader>: q:
+
 map <Left>  <C-w>h
 map <Down>  <C-w>j
 map <Up>    <C-w>k
@@ -123,11 +127,27 @@ map <S-Right> <C-w>>
 map <S-Down>  <C-w>-
 map <S-Up>    <C-w>+
 
+" navigate windows with alt+[hjkl]
+tnoremap <A-h> <C-\><C-N><C-w>h
+tnoremap <A-j> <C-\><C-N><C-w>j
+tnoremap <A-k> <C-\><C-N><C-w>k
+tnoremap <A-l> <C-\><C-N><C-w>l
+inoremap <A-h> <C-\><C-N><C-w>h
+inoremap <A-j> <C-\><C-N><C-w>j
+inoremap <A-k> <C-\><C-N><C-w>k
+inoremap <A-l> <C-\><C-N><C-w>l
+nnoremap <A-h> <C-w>h
+nnoremap <A-j> <C-w>j
+nnoremap <A-k> <C-w>k
+nnoremap <A-l> <C-w>l
+
 inoremap <C-U> <C-G>u<C-U>
 nnoremap & :&&<CR>
 xnoremap & :&&<CR>
 nnoremap Y y$
 
+inoremap <C-Space> <C-x><C-o>
+
 nmap <C-L>         :noh<cr>:redraw!<cr>
 
 nmap <F9>	   :make<CR>
@@ -165,4 +185,5 @@ let g:localvimrc_whitelist='/home/crater2150/code/.*'
 let g:localvimrc_sandbox=0
 
 let g:UltiSnipsEnableSnipMate = 0
+let g:ale_completion_enabled = 1
 " vi:foldmethod=marker sw=2
diff --git a/packages.vim b/packages.vim
index 01e5873..f28057a 100644
--- a/packages.vim
+++ b/packages.vim
@@ -25,7 +25,7 @@ Plug 'vim-scripts/argtextobj.vim'
 
 Plug 'mhinz/vim-signify'
 Plug 'neomake/neomake'
-Plug 'vim-syntastic/syntastic'
+"Plug 'vim-syntastic/syntastic'
 Plug 'Chiel92/vim-autoformat'
 
 " completion and snippets
@@ -33,10 +33,9 @@ Plug 'SirVer/ultisnips' | Plug 'honza/vim-snippets'
 Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' }
 
 
-"Plug 'nixprime/cpsm', { 'do': 'PY3=ON ./install.sh' } | Plug 'Shougo/denite.nvim' 
-
 Plug '/usr/share/vim/vimfiles'
 Plug 'junegunn/fzf.vim'
+Plug 'mileszs/ack.vim'
 
 Plug 'bling/vim-airline'
 
@@ -56,11 +55,18 @@ Plug 'gisphm/vim-gitignore'
 " C
 Plug 'derekwyatt/vim-fswitch'
 
-" other filetype specific plugins
 
-Plug 'derekwyatt/vim-scala'
+"Scala
+Plug 'crater2150/vim-scala', { 'branch': 'indent-fix' }
 Plug 'ensime/ensime-vim', { 'do': ':UpdateRemotePlugins' }
 
+" Rust
+Plug 'racer-rust/vim-racer'
+Plug 'rust-lang/rust.vim'
+Plug 'cespare/vim-toml'
+Plug 'w0rp/ale'
+
+" other filetype specific plugins
 Plug 'jamessan/vim-gnupg'
 Plug 'powerman/vim-plugin-AnsiEsc'
 Plug 'tpope/vim-markdown'
@@ -69,6 +75,7 @@ Plug 'ledger/vim-ledger'
 Plug 'elzr/vim-json'
 Plug 'kchmck/vim-coffee-script'
 Plug 'gre/play2vim'
+Plug 'isobit/vim-caddyfile'
 
 function! BuildComposer(info)
   if a:info.status != 'unchanged' || a:info.force