Current room
Some fixes