#3, #8 Correcting the revenue calculation for the yearly display and the formatting of currency values