ch6 - some grammar updates