Hooks revised + minor fixes