Add more PMD rules and fix them.