Minor editing to incorporate changes made by JP.