More Updates on BT

Also, a few flow bug fixes