Better Threading

Made some Mistakes with the threading. Corrected