Updates & fixes to the user system
Updating build