@ core/: some bug fixed
@ notification: working on making notification work