Fixing bugs. Removed workerFactory