consolidate: a lot more log output, better recovery