A bit more on generators, and some fixes