Small changes to the Doxgen generation. Lots more to do related to that