mostly changes to the gherkin-related files