+ fix issues with mouse/keyboard events
+ small improvments