hlisp and gherkin updates