Improve validators, small fixes
Merge branch 'dev' of https://github.com/dim-s/regenix into dev