fix one bug in Goal parser and mark another