more expand.js
misc
add thread expansions