Fixes for the generator, and more content.