find external sources, & more tests
reorg
drop debug code
simplify test
remove unneeded params
dissection tool
needed for test