includes christopher's editting suggestions
Merge branch 'vis9c' of https://github.com/ELVIS-Project/vis into vis9c