changed message handling and reporting