cleaned parser, fixed test.ff