More improvements

Improvements to calculator functions and the grid is getting there…some
grid calculations are still off.