fixed history, added notifications