vim: various fixes