Changed some more thread stuff