Improved logging
Really improved logging