Debug on first part of parser

most bugs fixed