Renamed factories to generators, improved doco a little.