Added more sections. Fixed inconsistent JSON behavior from caching.