clean up and fixes for users stuff