Added keylistner and small adjustments