various edits, focusing on the new parser structure