Mostly vector and util changes.  Still unstable.