Improved subway plots.
Gut some cruft.