Added a few generators, some improvements and tests