minor bugfixes and preemptive consolidation