Improved logging #2

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