Final clean up and bug fixes with notifications.