Use retval instead of return field in doxygen and comment a couple more files.