minor fixes to goto