fix history and setup