Updated for d3.js visualization and other things
Sync with repo.