fix grid, add letter
merge client