Minor fixes and class creation 'users'