Addresses some but not all FPSAC reviewer comments.