refactor and adjust notifications
0.1.46