more choroplethy. And d3 for the hackathon contest :D
fixed a lot