vim: updates and fixes