Improvemnts to dox templates.