removed lots of gumpf and added it to base class plus used fluent interface