some changes to make the files work in macvim, adds comments around things that I haven't been able to make work in macvim yet