vim: Some more updates