Fixing form field names, some improvements in terms of the form.