adds timeouts, worker distribution, and various other fixes