various fixes to documentation including doxygen comments
merge