I would just direct the committee back to its own report from 2017. There were some excellent recommendations there.
That said, some of the people who gave testimony suggested a complete rewrite of the law to best practices. There are countries out there, such as Ireland and Serbia, that have excellent laws that cover both the public and the private sector.
There are two approaches. You could either go back to the drawing board or start implementing some of the recommendations that OGGO itself made.