Further changes: Streamlined generator, chunkier solver