change some variable names, remove the namespace thingy and updated the room thingy