more fixes and added CBP stats for MB type