Fixing the really badly broken forms.  Lots of inconsistent logic being
fixed.  It isn't finished, but a check point is needed.