Cleanup; request JSON; fix fallback loading
Cleanup