added enrollment Rhino fixes