minor refactoring
fixes incorrect logging
fixes an error in implementation of B11