Some BMS improvements