Refactor, fix events on init, fix multiple events