fixes + vimrc cleanup