goto and labels, some fixes