a few small changes to some hooks