Updated stuff I missed

Moved a few checks around and fixed things I messed up.