updated

updated, I think the parser is working now, however there are a few
unused methods in here