Updated/added comments for Doxygen