fixing bugs in forms