Bugfix for hooks + refactor cure functions
Unstable changes