Swap back to using cpu count instead of hardcoded 1 thread
missed a mutex
Fixed an options issue