Finished user fields
Fixed syntax, style. Added a few methods and c-tors.
Merge branch 'master' into controller