updates to bs3.0-wip