Fix and doc builder grammar work