refactoring
echo_or_idle_or_improvise more patient (sways also in non-MC states)