assorted updates

still not releasable