Various improvements to vim's behaviour