Revert "Fixes"

This reverts commit a1bdb973acc906a941c68b1b1c7d1e7ed7f46694.
Revert "Revert "Fixes""

This reverts commit bba52895f0d71d7ab80dbe5602162bc40eaa35ba.
Revert "JSON functionality"

This reverts commit d395700bb0ea48f44e00bc7364e0dfef9dd149af.