More minor grammar simplifications, passes checks
Also update report (#24)