Major vim fixes.