- lots of misc updates