Added DATA support to `on`
Fix some docs