further manifest builder improvements