Added some more fields + descriptive tags for the form.