slight header / log changes, :shipit:?