Calculator program modified, again