minor fixes in new forms