Addresses review comments from @aledsage