update t-b with some rvm/rbx changes, and assert message fixes