calculator tweaks: addresses #43