Cleaned up code
Fixed switch statement
Fixed issue #250 - Status is set on join room