Comment & DOXYGEN update