Update BB to run standalone - see commit messages for changes

Tell @JhonM to use spaces isntead of tabs. Or is this @FransTwisk?