Upgrade and fix shuffle doxygen