Parser Update

Parser update, added some exceptions and tests.