started fixing up for camera-ready, addressing comments