fixed some stuff in bb