* Notification engine implemented
* Some fixes done