Added notification system
- Still in development, not woring as expected.

- Minor fixes and cleaner code