A bunch of small fixes for the vimrc and modified que slightly