more fixins

Fixed some final concurrency issues around header fetching.