Added logging, fixed doxygen