Various updates to bstm.