fixed some bbh bugs