Grammar fixes

Closes #111.