Many mods and updates to dispatcher / executor