implemented a number of adjustments to the grammar for hw.