replace beta_2m by a marco
fix up all macros