moved "constants" into own module, checks too and fixed #3