add more vim stuff, plus some other things