Tons of updates. Converted Shrines, reorganized a bit, etc.