Merge improvements that mostly show where the bugs are