added grid, minor edits