further updates, BaseUnit, header and comment improvements