Deal with connection timeout problems
Catch and re-throw errors
Comment fixes
Use section JSON directory as a cache

Stop re-loading data that we already have.