Updating user map, fixing a few bugs