a lot of fixes to teacher student relationship