made all of Johns changes except drilldown map