fixed enrollment constructors
Merge remote-tracking branch 'origin/mart-branch'