bug fixes, notifs clear & refacto