A bit more logging/indentation stuff.
Check header consistency more thoroughly.