how about we start with rebuilding criminal punishments.
Prison is a joke to most criminals, a fricking vacation.
Make time fit the crime.
Abolish parole boards
Impose "Danger to society" Sentence extensions for persons fitting.

Mental health. There should never be a bed unavailable if the person is deemed a danger to him/herself or others.
better tracking/registration and care for persons with mental health issues.

and if you are deemed a danger to society that you are isolated from it.