tweaks (prev. commit msg. forgot to mention threading change FTW)