refactoring of parser, etc
updates