Added TBB to remove -v0

And some additional cleanup that was needed...