Fixed entering room and refactored a little