cleaned parser, added more data