updated parser, minor issues
updated parser, minor issues