proper CMakeLists for doxygen support. Mindor other fixes.