Lots of changes to Vim changes, made stuff lighter