Lots of misc. updates