heavily updated Vim file and added some others