minor errors in room, should now work