Doxygen & mix_states improvements (master)