Resolved keylistener issues