More feature hooks, fixes, test coverage
Bump version