Mostly VIM stuff, plus some extras