idempotent prefetch, universal sync usage, fixed sync
Prepare for heroku deployment