Make some more, awesomer checks
More anon, and better checking