fixed goto-resolver and added labels to the toplevel grammar-rule