Fix references and figures