Add comments, recfactor and opt-in for uhd