Squash a ton of generator bugs and a renderer bug