minor combo table cleanup
minor whitespace cleanup
more minor cleanup
misc minor touch-ups
Whoops, type in a previous commit
Merge pull request #808 from linas/amos

assorted minor whitespace changes