Add some fields, fix form

If you decide to merge this PR,
I will reset your README and the imports paths.

Thanks