fix up forms to be more usefulg