update hooks, some cleanup