Added comments to the rest of the parser