improved and stabilized diagnostics/message handling