wip: fix events