updates - make form processing a little more consistent