yet another bunch of fixes: validation!