Fixes
Finish fixing User Setup