Feature/dox improvements