apply review comments. refs #497