join-header & small fixes