bvxm to boxm2 conversion and other changes