Tweaks and things to vim