make first batch of changes to lecture 22