added comments to names, updated parser