Pupil Import done, Some Fixes