Update lifecycle callbacks. Fixes #95
Fixing typo. Fixes #122