quick enroll plus some other small updates