Some minor touches, using templates for hooks