improve compliance and weave in Denis' suggestions.