Rooms now have descriptions; some refactoring