small updates to parser