misc fixes; extra hooks, etc