fix header assembly, other improvements