Tidy up mod_form whitespace
Add missing element types
Merge fixes from Andrew Nicols