vim improvements and keymapping