Doc and Grammar update