Fixed some more teacher stuffs