almost
threading fixes