Updated TOC to include notification.  Fixing bugs