Doxygen & mix_states improvements