polished a few hooks