fixes to form
merged fixes