more fixing warnings and stuff

Other stuff that is bad about this code, besides the spacing and lack
of brackets I mentioned in my previous commit:
- original author apparently could not tell the difference between '='
and '==', so I am having a hard time guessing what their original
intent was in deciding which one to use...
- uses 'goto' way too much. Normally '-Wunused-label' should not
produce this many warnings, because there should not be that many
labels for 'goto' statements to jump to in the first place

Anyways I think I might have screwed it up even more by trying to fix
all this stuff...