bugfixes
Add notifications