Addresses more FPSAC reviewer comments.