Improved logging #2

Will be a long list until I realize how to put together all the things.