Better form input.  Fixes #22