more thread experiments & clean up