Link to the current room
Fixed 2 warnings
Fixed a failing test