Some more updates to vim