ExpectTrace in progress

some new parsers
comment fixups