Slight edits to parser