change the way executors are paired with slots so fix some bugs