added doxygen to h files
from a merge