removed old version of parser, and other minor changes