3.0 lots of editing across the board: xrefs, images, cleanup, etc