Forms
Fixing it up

Fixing discrepancies
Fixing more stuff
Merge pull request #7 from JT1989/jt/forms

Forms