e6 issue 344 - change and cleanup for proper handling of the different debug output choices