cleaned up parser, comments