Vim fixes and snippets