Other improvements e.g. added from vimrc_timplunkett