Fix on' and add more wrappers

Fixes #8 and #9