fixed some of user stuff