Update BB to run standalone - see commit messages for changes

No tabs please....