removed old enum, enhanced multiple key presses