Add more logging output, isolated kwargs manipulations