Update notifications
code cleanup and fixes