Code cleanup
Updated rabbit
Have to fix this.
Fixed currentRoom bug and conflict