bugfixes on forms