add @djug as a reviewer, plus some minor refinements