updated user model and event model, changed variables pertaining