tweaked the basic generators a bit, backwards compatible, though
added a new generator