rework some vim shortcuts so everything makes more sense