misc changes + move to vim-go