Release/bb refaktor

Manual fixes for earlier PR.