assorted updates; continued work on new caching stuff