Got rid of most log calls, partial threading fix