diff --git a/.bash_aliases b/.bash_aliases
new file mode 100644
index 0000000..087d0c5
--- /dev/null
+++ b/.bash_aliases
@@ -0,0 +1 @@
+alias gl="git log --oneline --decorate"
diff --git a/.vimrc b/.vimrc
index 16811ed..66d25c6 100644
--- a/.vimrc
+++ b/.vimrc
@@ -133,3 +133,11 @@ autocmd Filetype markdown let b:coc_suggest_disable = 1
 let g:ctrlp_map = '<c-p>'
 let g:ctrp_custom_ignore = '\v[\/]\.(git|node_modules)$'
 let g:ctrlp_user_command = ['.git', 'cd %s && git ls-files -co --exclude-standard']
+
+
+nmap <silent> gd <Plug>(coc-definition)
+nmap <silent> gy <Plug>(coc-type-definition)
+nmap <silent> gi <Plug>(coc-implementation)
+nmap <silent> gr <Plug>(coc-references)
+nmap <Leader>rn <Plug>(coc-rename)
+
diff --git a/init.vim b/init.vim
index ce1601d..863cec1 100644
--- a/init.vim
+++ b/init.vim
@@ -7,7 +7,7 @@ set incsearch
 set relativenumber
 set number
 set encoding=utf-8
-set colorcolumn=80
+set colorcolumn=81
 highlight ColorColumn ctermbg=lightgrey guibg=lightgrey
 
 set noswapfile
@@ -18,6 +18,8 @@ set undofile
 "Tabbing
 set autoindent tabstop=4 shiftwidth=4
 
+"File specific
+
 "**************************
 "Commands
 
@@ -39,18 +41,9 @@ nnoremap <Leader>fs :w<cr>
 nnoremap <Leader>fer :source ~/.config/nvim/init.vim<cr>
 nnoremap <Leader>r :<C-u>registers<CR>:normal! "p<Left>
 nnoremap <Leader>p :set paste!<cr>
-
 nnoremap <Leader>c "+
 vnoremap <Leader>c "+
 
-"Plugins
-
-"Telescope
-nnoremap <leader>ff <cmd>Telescope find_files<cr>
-nnoremap <leader>fg <cmd>Telescope live_grep<cr>
-nnoremap <leader>fb <cmd>Telescope buffers<cr>
-nnoremap <leader>fh <cmd>Telescope help_tags<cr>
-
 "**************************
 " Bracket completion
 
@@ -73,12 +66,32 @@ Plug 'tpope/vim-commentary'
 Plug 'tpope/vim-fugitive'
 Plug 'jonsmithers/vim-html-template-literals', { 'branch': 'dev' }
 Plug 'godlygeek/tabular'
-"Plug 'neoclide/coc.nvim', { 'branch': 'release' }
 Plug 'plasticboy/vim-markdown'
 Plug 'yuezk/vim-js'
-Plug 'fatih/vim-go'
-" Plug 'ctrlpvim/ctrlp.vim'
 Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'}
+Plug 'neoclide/coc.nvim', { 'branch': 'release' }
 Plug 'nvim-lua/plenary.nvim'
 Plug 'nvim-telescope/telescope.nvim'
 call plug#end()
+
+"**************************
+" Plugin Configs
+
+"Telescope
+nnoremap <leader>ff <cmd>Telescope find_files<cr>
+nnoremap <leader>fg <cmd>Telescope live_grep<cr>
+nnoremap <leader>fb <cmd>Telescope buffers<cr>
+nnoremap <leader>fh <cmd>Telescope help_tags<cr>
+
+"Markdown
+autocmd FileType markdown set colorcolumn=
+
+"**************************
+" COC
+nmap <silent> gd <Plug>(coc-definition)
+nmap <silent> gy <Plug>(coc-type-definition)
+nmap <silent> gi <Plug>(coc-implementation)
+nmap <silent> gr <Plug>(coc-references)
+nmap <Leader>rn <Plug>(coc-rename)
+
+autocmd BufWritePre *.go :silent call CocAction('runCommand', 'editor.action.organizeImport')