moved generator location and added --engine=ENGINE option