- reordered onion native events
- some small refactors