fixing loading if worker returns hit, other minor bugfixes