some improvements in form tester and some general stuff