fix some wording issues and incorrect checks, move to own module.