fixed more problems with worker