vim: various improvements