new enrollment intro, and some for fixes
Merge branch 'origin/master'