More vim work