refined notification system+some bug fixed