Finish a good portion of grid enhancements, except word order