More changes in Gleez User

See comments & diff