updated

Made additional changes to CalculatorMain (based on announcement to
class)