bvsls refactoring

Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
bvsls bugfix

Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>