fixing a bunch of things with the generator.