Notifications work, and messages fixed