Address comments from emilyst and swenson.