Bugfixing
Improve key-handling