Lots of dox updates