lots of changes to vim