minor, reworking make2 grammar