Fixed a bunch of checks, more to come!