Fixed add_user and a bunch of other stuff