Notifications working and Null pointer bug fixes.