Edits to work in progress on choropleth