make final batch of changes to lecture 22