Made first problems easier
Adjustments to some generators,

And removed the extension of EquationGenerator, which is all static
anyway