Improved Notification Management & Comments

Also trying to bring the commentary issue up on the agenda