Fix errors and improve Worker