update

- review of Hook system
- other minor changes