more tweaks, still sometimes get text errors from big-bang
fix so active threads are cleaned up on normal success and failure