I believe the cabinet exclusion should be converted into a mandatory exemption, and also the commissioner should have the right to view the records to see that they are properly classified.
As well, the second would be the policy advice exemption, which needs a harms test, a 10-year limit and a clear statement that background and facts cannot be withheld as analysis.
That's a good start anyway, but there's more.