vim: Various update