make sure manifest is cleaned up; add index filter to the units iterator.
use UnitRef appraoch instead.