make second batch of changes to lecture 22