diff --git a/.vimrc b/.vimrc
index 404833c..a1ebc98 100644
--- a/.vimrc
+++ b/.vimrc
@@ -1,4 +1,5 @@
-"Vundle stuff"
+"Vundle stuff
+"{{{
 set nocompatible
 filetype off
 
@@ -18,19 +19,36 @@ Plugin 'majutsushi/tagbar'
 Plugin 'petRUShka/vim-opencl'
 
 call vundle#end()
+"}}}
 
+"Syntax
+"{{{
 filetype plugin indent on
 syntax enable
 syntax sync maxlines=256
 set synmaxcol=200
+"}}}
 
 "Options
+"{{{
 set expandtab
 set shiftwidth=4
 set tabstop=4
 set foldlevel=99
+set encoding=utf-8
+set number
+set showmatch
+set matchtime=2
+
+set hlsearch
+set incsearch
+
+set laststatus=2
+"set splitbelow
+"}}}
 
 "Gui stuff
+"{{{
 set guifont=Consolas:h12
 set guicursor=n-v-i-c:block-Cursor
 set guioptions-=e
@@ -42,34 +60,32 @@ set guioptions-=m
 set guioptions-=T
 
 set langmenu=en_US.UTF-8
+"}}}
 
-set encoding=utf-8
-set number
-set showmatch
-set matchtime=2
-
-set hlsearch
-set incsearch
-
-set laststatus=2
-"set splitbelow
 "Colors
+"{{{
 colorscheme izi
 "let g:airline_theme='light'
+""}}}
 
 "Tagbar stuff
+"{{{
 let g:tagbar_ctags_bin = '/usr/local/bin/ctags'
 let g:tagbar_autofocus = 1
+"}}}
 
 "YouCompleteMe stuff
+"{{{
 set completeopt-=preview
 let g:ycm_autoclose_preview_window_after_completion = 1
 let g:ycm_global_ycm_extra_conf = '~/.ycm_global_extra_config.py'
 let g:ycm_python_binary_path = '/usr/local/bin/python3'
 let g:syntastic_python_python_exec = '/usr/local/bin/python3'
 set shortmess+=c
+"}}}
 
 "Mappings
+"{{{
 let mapleader = ","
 let maplocalleader = ","
 nnoremap q <nop>
@@ -96,8 +112,10 @@ vnoremap <c-c> "+y
 onoremap p i(
 onoremap qd i"
 onoremap qs i'
+"}}}
 
 "Mappings for Plugins
+"{{{
 nnoremap <leader>N :NERDTree<cr>
 nnoremap <leader>r :AirlineRefresh<cr>
 nnoremap <leader>] :YcmCompleter GoTo<cr>
@@ -105,6 +123,9 @@ nnoremap <leader>ye :YcmShowDetailedDiagnostic<cr>
 nnoremap <leader>yf :YcmCompleter FixIt<cr>:ccl<cr>
 nnoremap <leader>yd :YcmDiags<cr>
 nnoremap <leader>T :TagbarToggle<cr>
+"}}}
 
 "Abbreviations
+"{{{
 iabbrev rr return
+"}}}
diff --git a/ftplugin/c.vim b/ftplugin/c.vim
index 713192e..90e75e5 100644
--- a/ftplugin/c.vim
+++ b/ftplugin/c.vim
@@ -3,9 +3,9 @@ iabbrev <buffer> im(a) int main(int argc, const char** argv)
 iabbrev <buffer> maw #pragma message("malloc warning!")
 nnoremap <buffer> <localleader>fb ][%
 nnoremap <buffer> <localleader>fe ][
-nnoremap <buffer> <localleader>c I//<esc>
+nnoremap <buffer> <localleader>c mcI//<esc>`c:delm c<cr>
 vnoremap <buffer> <localleader>c <esc>`>o*/<esc>`<O/*<esc>
-nnoremap <buffer> <localleader>xc mx/\*\/<cr>dd?\/\*<cr>dd`x:noh<cr>:delm x<cr>
+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/ftplugin/make.vim b/ftplugin/make.vim
index 13f1a72..28807d8 100644
--- a/ftplugin/make.vim
+++ b/ftplugin/make.vim
@@ -1 +1 @@
-setlocal noexpandtab softtabstop=0 shiftwidth=8 tabstop=8
+setlocal noexpandtab shiftwidth=8 tabstop=8
diff --git a/ftplugin/python.vim b/ftplugin/python.vim
index 2d27cb6..34f5c1c 100644
--- a/ftplugin/python.vim
+++ b/ftplugin/python.vim
@@ -1,2 +1,5 @@
-nnoremap <buffer> <leader>c I#<esc>
-vnoremap <buffer> <leader>c <esc>`>o"""<esc>`<O"""<esc>
+nnoremap <buffer> <localleader>c mcI#<esc>`c:delm x<cr>
+vnoremap <buffer> <localleader>c <esc>`>o"""<esc>`<O"""<esc>
+
+nnoremap <buffer> <localleader>xb mx?"""<cr>dd/"""<cr>dd`x:noh<cr>:delm x<cr>
+nnoremap <buffer> <localleader>xc mx?#<cr>x`x:noh<cr>:delm x<cr>
diff --git a/ftplugin/vim.vim b/ftplugin/vim.vim
index 3309d9b..7e1ca58 100644
--- a/ftplugin/vim.vim
+++ b/ftplugin/vim.vim
@@ -1,4 +1,5 @@
-nnoremap <buffer> <localleader>c I"<esc>
+setlocal foldmethod=marker
+nnoremap <buffer> <localleader>c mcI"<esc>`c:delm c<cr>
 vnoremap <buffer> <localleader>f <esc>`>o"}}}<esc>`<O"{{{<esc>
 nnoremap <buffer> <localleader>xf mx?"{{{<cr>dd/"}}}<cr>dd`x:noh<cr>:delm x<cr>
-nnoremap <buffer> <localleader>xc mx^0x`x
+nnoremap <buffer> <localleader>xc mx^x`x