corrected async worker and other corrections