removed creation of rooms, added some of the user<->none stuff back in