numerous fixes for mrfy validation