fixed some messaging issues.

Fixed some timing bugs on when messages were delivered.