Add tp 3 and 4 to the report, and uniformize formatting