diff --git a/plugin/comment.vim b/plugin/comment.vim
index 0ad1398..e9c20c8 100644
--- a/plugin/comment.vim
+++ b/plugin/comment.vim
@@ -21,7 +21,7 @@ let s:block_map = {
 function! MyCommenter(uncomment) range
     let comment = get(s:comment_map, &ft, '')
     if exists('g:custom_comment_map')
-        let comment = get(g:custom_comment_map, &ft, '')
+        let comment = get(g:custom_comment_map, &ft, comment)
     endif
     if !len(comment)
         return
diff --git a/plugin/settings.vim b/plugin/settings.vim
index 4aff954..5c6fc9e 100644
--- a/plugin/settings.vim
+++ b/plugin/settings.vim
@@ -106,7 +106,9 @@ augroup END
 " Mappings
 " {{{
 let mapleader = ","
+nnoremap , <nop>
 let maplocalleader = " "
+nnoremap <space> <nop>
 nnoremap q <nop>
 nnoremap Q <nop>
 nnoremap qn :nohl<cr>
@@ -143,10 +145,12 @@ nnoremap <leader>so :syntax off<cr>
 
 nnoremap <leader>fl mf081lF<space>r<cr>`f:delm f<cr>
 
+nnoremap <leader>v <c-v>
 vnoremap <leader>" <esc>`>a"<esc>`<i"<esc>
 vnoremap <c-c> "+y
 nnoremap <c-v> "+p
 inoremap <c-v> <esc>"+p
+vnoremap <c-v> x"+P
 " }}}
 
 " Mappings for Plugins