Gleez User

* Cleaunp User module
* Minor fixes

See diff & comments