Lots of vim changes