and some validator bugfixes