fixes to form