Much improve JSON handling.  Yay!