Fixed more tutoring bugs