Improved notifications

and fixed the bug which had to do with mentions in comments