fixed bugs in forms