Adding a few missed files, fixing a notify