Added Shrine/Altar removal, reorganized some things, small bug fixes.