Bugfixes, cleaner notifications