Improved logging

Contains some logging improvements :lipstick: