Feature/dox updates