more changes to calc.rb