lots of misc updates