diff --git a/bashrc b/bashrc
index ea881f8..96f3b82 100644
--- a/bashrc
+++ b/bashrc
@@ -117,6 +117,7 @@ alias mv="mv -v"
 alias la='ls -lah $LS_COLOR'
 alias dt='date "+%F %T"'
 alias awake='disphost; while true; do xdotool mousemove 0 0; sleep 60; done'
+alias adk='/home/stonewareslord/applications/adk/bin/studio.sh>/dev/null&'
 alias resource='. ~/.bashrc'
 alias install='sudo apt-get install'
 alias search='sudo apt-cache search'
diff --git a/vimrc b/vimrc
index ca46a0c..385ea67 100644
--- a/vimrc
+++ b/vimrc
@@ -4,6 +4,7 @@ if has('conceal')
 endif
 nnoremap <Leader>autoformat! :%s/, /,<CR>:%s/ \/ /\/<CR>:%s/ {/{<CR>:%s/} /}<CR>:%s/ = /=
 command! W %!sudo tee > /dev/null %
+autocmd FileType * setlocal formatoptions-=c formatoptions-=r formatoptions-=o
 au VimResized * exe "normal! \<c-w>="
 "match Error /\s\+$/
 "nnoremap s xa
@@ -11,8 +12,8 @@ au VimResized * exe "normal! \<c-w>="
 inoremap <expr><Tab> pumvisible() ? "\<C-n>" : "\<Right>"
 imap <Expr>\ neosnippet#expandable_or_jumpable() ? "\<Plug>(neosnippet_expand_or_jump)" : pumvisible() ? "\<C-n>" : "\<TAB>"
 smap <Expr>\ neosnippet#expandable_or_jumpable() ? "\<Plug>(neosnippet_expand_or_jump)" : "\<TAB>" 
-nnoremap <C-w>\| <C-w>v
-nnoremap <C-w>- <C-w>s
+nnoremap <C-w>\| <C-w>v<C-w>l
+nnoremap <C-w>- <C-w>s<C-w>j
 nnoremap <C-d> <C-w>q
 nnoremap <F3> :!make&&echo "Uploading robot code";wput ./PPC603gnu/src/Debug/src.out ftp://frc:frc@10.20.59.2/ni-rt/system/FRC_UserProgram.out<CR>
 nnoremap G G$