Reorganize vim stuff, better numbers