overhaul of events system
redirect of currentTarget for compatibility