message fixes and notification added