cleaned up messaging some more