Fixed crashes, still need to work on the number of users