Doxygen Style comments + updated documentation