fixed threads and other dumb things