Address some of @gregcaporaso's comments