Adjusted and added doxygen documentation