updates to generator, closes #1, closes #5