add sinks, replace generators with sources, other factoring