Progress on UF module; slightly clean up UF proficiency exercise