rooms stuff, security improvments