Small improvements to the calculator portion of the UberTool.