Calculator improvements