parser & help fixes