Grammar and Fixes