Several small changes.  threading is still broken, chewing thew my rams even though only 4 threads run concurrently for some reason