More references and heading changes