fixes and adding history