yet another merge with Eliot's spur branch
some cleanups