minor bug fixes to some forms