who is in the room? and small fixes