Fix some race conditions that don't actually happen, add basic d3 demo