Fixed some more gotos.
Goto and little refactoring.