Updates to choropleth
Fixes to release grunt