Improving hooks and docs