fixed history and minor  current edit