streamlined some toolkit-listeners