A bit more doxygen documentation added