fixed more form problems
CR