some final touches, still need to review datafidelity code