Expanded grid to cover integer, calculated, and numeric values
Fixed typo