minor fixes
actual code for enrollment