fixed history, saving and async issues
fixed history, saving and async issues