header and track fixes