Major overhaul

Fixes in D3, map, connectors, everything.