make improvements according to amix's vimrc