some more work on parsers, added comments