Threading and Clean Up

Stable again