Touched up in a few files.
Updates for vim