Fixed notifications and a couple bugfixes
Merge pull request #405 from scouttyg/notifications-fix

Fixed notifications and a couple bugfixes