Student class expanded, some reworks