fixes to handle form