* Core fixes
* event handling