Add notification options. Other changes.