Fixed some of the thread issues

:)