fixes and refinements
changes to initiators