improve coverage, reduce violations