fixed Parser.h; add logic pars several notions