Review and fix logging, step 1.