Updated user class and minor server stuff