checkpoint on the generator dsl
fixing specs