a few more vim corrections and additions