added some new generators, fixed some other stuff, also removed a bunch
of eclipse warnings