More fixed.

Thanks Caleb, pointing out so much more to make my ocd go insane.