minor form fixes
added some mappings
Merge pull request #8 from willtp87/7.x

Form fixes