more on packaging, internal reworkings, error checks