Simplification
Simplify
Simplify key handling
Fix hack
Fix handling of event twice'
Small fixes