bit more cleanup, made logs more concise.