issue #800 addressing review items