Imroved activation and update hooks.
Fixes #21. Fixes #22.