Cleaned up issues for grids, began on package. #222