diff --git a/ftplugin/java.vim b/ftplugin/java.vim
index 7a02785..0d5f74d 100644
--- a/ftplugin/java.vim
+++ b/ftplugin/java.vim
@@ -1 +1,9 @@
 iabbrev <buffer> cout System.out.println
+nnoremap <buffer> <localleader>fb ][%
+nnoremap <buffer> <localleader>fe ][
+nnoremap <buffer> <localleader>c mcI//<esc>`c:delm c<cr>
+vnoremap <buffer> <localleader>c <esc>`>o*/<esc>`<O/*<esc>
+nnoremap <buffer> <localleader>xc mx^xx`x:delm x<cr>
+nnoremap <buffer> <localleader>xb mx?\/\*<cr>dd/\*\/<cr>dd`x:noh<cr>:delm x<cr>
+
+setlocal foldmethod=syntax foldlevel=99
diff --git a/plugin/settings.vim b/plugin/settings.vim
index bac6843..3e0deb6 100644
--- a/plugin/settings.vim
+++ b/plugin/settings.vim
@@ -84,6 +84,7 @@ augroup END
 let mapleader = ","
 let maplocalleader = ","
 nnoremap q <nop>
+nnoremap qn :nohl<cr>
 nnoremap ql :lclose<cr>
 nnoremap qq :cclose<cr>
 nnoremap qp :pclose<cr>
@@ -100,7 +101,6 @@ endif
 nnoremap <leader>sl :tabe $MYVIMRC<cr>
 nnoremap <leader>ss :execute 'tabe' my_settings_file<cr>
 nnoremap <leader>sv :source $MYVIMRC<cr>:execute 'source' my_settings_file<cr>
-nnoremap <leader>n :noh<cr>
 nnoremap <leader>k <c-w><c-k>
 nnoremap <leader>j <c-w><c-j>
 nnoremap <leader>h <c-w><c-h>
@@ -129,5 +129,6 @@ nnoremap <leader>T :TagbarToggle<cr>
 "Abbreviations
 "{{{
 iabbrev rr return
+iabbrev itt import
 cabbrev w!! w !sudo tee > /dev/null %<cr>
 "}}}