Single Key listener, Bug fixes