Fixing logging, in progress..