Continued work on Threads, applied a few fixes to engine classes.