Release/bb onepercent

Minor tweaks needed for 1% refactoring