Added empty room (ChrisHoulihan) and tweaked some things concerning warps