updated tornwrap (wwm)
wip
remove cli / env stuff