Almost finish report part

fixing bug