Update for BM 1.2.0a and b, plus new stuff!