Most CALCULATION FIXES. Live Data now Included in Annual Data and all Charts, Test Case fixes too. Remove uncessary System.out.Printlns

Most CALCULATION FIXES. Live Data now Included in Annual Data and all Charts, Test Case fixes too. Remove uncessary System.out.Printlns