Hooks

Some issues found fixed