Fix Bugs
Finish updating users