Some more work on the teaching paper, trying to get consistent style