a few tweaks and remove local mvel dep