Added more traps for thread lockup - need to add a timeout wherever waiting for all threads to exit