remaining cp changes
minor tutoring changes
final minor tutoring changes