Better logging and first pass at stopping reordering past footer