Improvements.  Still has a threading problem.