assorted changes over the past month (probably broken)