Json API spike.
Cleanup and resolved compiler warnings