fix bugs with workers, restyling