changed room1 to entrance fixed a few bugs