I added a couple items based on the comments here.