Removed bugged warp and added re-entry on floor 2.

most likely should be tested before pushed