trying
Some comment updates
Merging in Mark's changes

This still needs some more work, but it's working enough for others to
use, so here it goes...
merging changes