Fix a typo and convert some if's to have {}'s so

you know whats going on.

Thanks again to nullinfinite.