Improved keyboard handling, added some keys.