don't use action hooks in extensions

and other changes to extensions