Add cross-refs; edit

Reuses: c63c0a6f7626eee737a7dda98254e11389b1e217