Fixed some bugs and added notifications