Adjust some logging
Workign on cleaning up logging