Generators, more about traits, minor other stuff