various adaptions according to today's discussions on beam objects and matching / generating principles -- and the redesign of beams class coming with that