changed back to waiting for keypress rather than system events, unfortunatly re-introducing the two-action per keypress bug.