added some comments to Calculator, more needed