more speed increases and stability fixes for ci