Started coherence, bugfixes