Updated stuff I missed

Moved a few checks around and fixed things I messed up.
Merge pull request #1 from Healdb/master

Updated stuff I missed