Cleaning up loose files and a few extra notifier issues