tweaks, prepare to fork nmrg