Fixed notifications and a couple bugfixes