Last minute changes for ynsetup

Hey!