Various changes...

Turns out to be much more complicated since many JSONs are malformed. Meh.