Added Product and Avg to Calc.js