more edits, getting close to camera-ready