Finished html report and fixed cli report