fixed up some forms stuff