Finish report and fix some bugs in history