Improvement to dox system and documentation