lots of vim changes