Free Enroll and some minor fixes