Addressing smaller changes from Aaron's review