Fixed stupid stuff (goto)

Not enough changes for a new release.