Added a scratch-pad for index catch-up
Introduced a timeout for waiting for indexing to take place, started setting a per-index flag in how far along they are in the indexing process