bug fixing

+ fix bugs that came after the presentation layer
+ fix notifications