Somewhat improved logging
Somewhat improved logging