Adaptation to MvStore, multithreaded consumers, retry scheduling

Cleanup indentation?