minor fixes to forms