fixing stuff in goto