rework some things, although vim is loading slow now
vim changes