Some bug fixes and simplifications, efficient Coherence bootstrap