Generators now extend base generator
some minor fixes