more BMS trip work

+ random fixes