diff --git a/Limelight/Input/StreamView.m b/Limelight/Input/StreamView.m
index beb2928e..9df03eb3 100644
--- a/Limelight/Input/StreamView.m
+++ b/Limelight/Input/StreamView.m
@@ -23,6 +23,7 @@ static const double X1_MOUSE_SPEED_DIVISOR = 2.5;
     KeyboardInputField* keyInputField;
     BOOL isInputingText;
     NSMutableSet* keysDown;
+    UITapGestureRecognizer* _keyboardToggleTapRecognizer;
     
     float streamAspectRatio;
     
@@ -70,6 +71,12 @@ static const double X1_MOUSE_SPEED_DIVISOR = 2.5;
     [keyInputField setAutocapitalizationType:UITextAutocapitalizationTypeNone];
     [keyInputField setSpellCheckingType:UITextSpellCheckingTypeNo];
     [self addSubview:keyInputField];
+    _keyboardToggleTapRecognizer  = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(toggleKeyboard)];
+    _keyboardToggleTapRecognizer.numberOfTouchesRequired = 2;
+    _keyboardToggleTapRecognizer.numberOfTapsRequired = 2;
+    _keyboardToggleTapRecognizer.delaysTouchesBegan = NO;
+    _keyboardToggleTapRecognizer.delaysTouchesEnded = NO;
+    [self addGestureRecognizer:_keyboardToggleTapRecognizer];
     
 #if TARGET_OS_TV
     // tvOS requires RelativeTouchHandler to manage Apple Remote input
@@ -137,6 +144,42 @@ static const double X1_MOUSE_SPEED_DIVISOR = 2.5;
     [self becomeFirstResponder];
 }
 
+- (void)toggleKeyboard{
+        if (isInputingText) {
+            Log(LOG_D, @"Closing the keyboard");
+            [keyInputField resignFirstResponder];
+            isInputingText = false;
+        } else {
+        Log(LOG_D, @"Opening the keyboard");
+        // Prepare the textbox used to capture keyboard events.
+        keyInputField.delegate = self;
+        keyInputField.text = @"0";
+        #if !TARGET_OS_TV
+        // Prepare the toolbar above the keyboard for more options
+            if(false){
+                UIToolbar *customToolbarView = [[UIToolbar alloc] initWithFrame:CGRectMake(0, 0, self.bounds.size.width, 44)];
+                UIBarButtonItem *doneBarButton = [self createButtonWithImageNamed:@"DoneIcon.png" backgroundColor:[UIColor clearColor] target:self action:@selector(toolbarButtonClicked:) keyCode:0x00 isToggleable:NO];
+                UIBarButtonItem *windowsBarButton = [self createButtonWithImageNamed:@"WindowsIcon.png" backgroundColor:[UIColor blackColor] target:self action:@selector(toolbarButtonClicked:) keyCode:0x5B isToggleable:YES];
+                UIBarButtonItem *tabBarButton = [self createButtonWithImageNamed:@"TabIcon.png" backgroundColor:[UIColor blackColor] target:self action:@selector(toolbarButtonClicked:) keyCode:0x09 isToggleable:NO];
+                UIBarButtonItem *shiftBarButton = [self createButtonWithImageNamed:@"ShiftIcon.png" backgroundColor:[UIColor blackColor] target:self action:@selector(toolbarButtonClicked:) keyCode:0xA0 isToggleable:YES];
+                UIBarButtonItem *escapeBarButton = [self createButtonWithImageNamed:@"EscapeIcon.png" backgroundColor:[UIColor blackColor] target:self action:@selector(toolbarButtonClicked:) keyCode:0x1B isToggleable:NO];
+                UIBarButtonItem *controlBarButton = [self createButtonWithImageNamed:@"ControlIcon.png" backgroundColor:[UIColor blackColor] target:self action:@selector(toolbarButtonClicked:) keyCode:0xA2 isToggleable:YES];
+                UIBarButtonItem *altBarButton = [self createButtonWithImageNamed:@"AltIcon.png" backgroundColor:[UIColor blackColor] target:self action:@selector(toolbarButtonClicked:) keyCode:0xA4 isToggleable:YES];
+                UIBarButtonItem *deleteBarButton = [self createButtonWithImageNamed:@"DeleteIcon.png" backgroundColor:[UIColor blackColor] target:self action:@selector(toolbarButtonClicked:) keyCode:0x2E isToggleable:NO];
+                UIBarButtonItem *flexibleSpace = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemFlexibleSpace target:nil action:nil];
+                
+                [customToolbarView setItems:[NSArray arrayWithObjects:doneBarButton, windowsBarButton, escapeBarButton, tabBarButton, shiftBarButton, controlBarButton, altBarButton, deleteBarButton, flexibleSpace, nil]];
+                keyInputField.inputAccessoryView = customToolbarView;
+            }
+        #endif
+        [keyInputField becomeFirstResponder];
+        [keyInputField addTarget:self action:@selector(onKeyboardPressed:) forControlEvents:UIControlEventEditingChanged];
+        // Undo causes issues for our state management, so turn it off
+        [keyInputField.undoManager disableUndoRegistration];
+        isInputingText = true;
+    }
+}
+
 - (void)startInteractionTimer {
     // Restart user interaction tracking
     hasUserInteracted = NO;
@@ -435,22 +478,22 @@ static const double X1_MOUSE_SPEED_DIVISOR = 2.5;
     
 #if !TARGET_OS_TV
     if (@available(iOS 13.4, *)) {
-//        NSArray<UITouch*> *arr1 = [[event allTouches] allObjects];
-////        NSLog(@"touchesBegan - %lu",[[event allTouches] count]);
-////        NSLog(@"touchesBegan - %lu",arr1.count);
-//
-//        for(int i=0;i<arr1.count;i++){
-//            if (arr1[i].type == UITouchTypePencil) {
-//                [self sendStylusEvent:arr1[i]];
-//                return;
-//                
-//            }
-//            TemporarySettings* settings = [[[DataManager alloc] init] getSettings];
-//            if (settings.absoluteTouchMode) {
-//                [self handleUITouch:arr1[i] index:i];
-//                return;
-//            }
-//        }
+        //        NSArray<UITouch*> *arr1 = [[event allTouches] allObjects];
+        ////        NSLog(@"touchesBegan - %lu",[[event allTouches] count]);
+        ////        NSLog(@"touchesBegan - %lu",arr1.count);
+        //
+        //        for(int i=0;i<arr1.count;i++){
+        //            if (arr1[i].type == UITouchTypePencil) {
+        //                [self sendStylusEvent:arr1[i]];
+        //                return;
+        //
+        //            }
+        //            TemporarySettings* settings = [[[DataManager alloc] init] getSettings];
+        //            if (settings.absoluteTouchMode) {
+        //                [self handleUITouch:arr1[i] index:i];
+        //                return;
+        //            }
+        //        }
         for (UITouch* touch in touches) {
             if (touch.type == UITouchTypePencil) {
                 if ([self sendStylusEvent:touch]) {
@@ -461,7 +504,7 @@ static const double X1_MOUSE_SPEED_DIVISOR = 2.5;
             if (settings.absoluteTouchMode) {
                 [self handleUITouch:touch index:0];
                 
-//                return;
+                //                return;
             }
         }
         // NSLog(@"touchesBegan - allTouches %lu, pointerSet count %lu",[[event allTouches] count], [pointerIdSet count]);
@@ -476,42 +519,7 @@ static const double X1_MOUSE_SPEED_DIVISOR = 2.5;
         // is triggered.
         [touchHandler touchesBegan:touches withEvent:event];
         
-//        if ([[event allTouches] count] == 3) {
-//            if (isInputingText) {
-//                Log(LOG_D, @"Closing the keyboard");
-//                [keyInputField resignFirstResponder];
-//                isInputingText = false;
-//            } else {
-//                Log(LOG_D, @"Opening the keyboard");
-//                // Prepare the textbox used to capture keyboard events.
-//                keyInputField.delegate = self;
-//                keyInputField.text = @"0";
-//#if !TARGET_OS_TV
-//                // Prepare the toolbar above the keyboard for more options
-//                UIToolbar *customToolbarView = [[UIToolbar alloc] initWithFrame:CGRectMake(0, 0, self.bounds.size.width, 44)];
-//                
-//                UIBarButtonItem *doneBarButton = [self createButtonWithImageNamed:@"DoneIcon.png" backgroundColor:[UIColor clearColor] target:self action:@selector(toolbarButtonClicked:) keyCode:0x00 isToggleable:NO];
-//                UIBarButtonItem *windowsBarButton = [self createButtonWithImageNamed:@"WindowsIcon.png" backgroundColor:[UIColor blackColor] target:self action:@selector(toolbarButtonClicked:) keyCode:0x5B isToggleable:YES];
-//                UIBarButtonItem *tabBarButton = [self createButtonWithImageNamed:@"TabIcon.png" backgroundColor:[UIColor blackColor] target:self action:@selector(toolbarButtonClicked:) keyCode:0x09 isToggleable:NO];
-//                UIBarButtonItem *shiftBarButton = [self createButtonWithImageNamed:@"ShiftIcon.png" backgroundColor:[UIColor blackColor] target:self action:@selector(toolbarButtonClicked:) keyCode:0xA0 isToggleable:YES];
-//                UIBarButtonItem *escapeBarButton = [self createButtonWithImageNamed:@"EscapeIcon.png" backgroundColor:[UIColor blackColor] target:self action:@selector(toolbarButtonClicked:) keyCode:0x1B isToggleable:NO];
-//                UIBarButtonItem *controlBarButton = [self createButtonWithImageNamed:@"ControlIcon.png" backgroundColor:[UIColor blackColor] target:self action:@selector(toolbarButtonClicked:) keyCode:0xA2 isToggleable:YES];
-//                UIBarButtonItem *altBarButton = [self createButtonWithImageNamed:@"AltIcon.png" backgroundColor:[UIColor blackColor] target:self action:@selector(toolbarButtonClicked:) keyCode:0xA4 isToggleable:YES];
-//                UIBarButtonItem *deleteBarButton = [self createButtonWithImageNamed:@"DeleteIcon.png" backgroundColor:[UIColor blackColor] target:self action:@selector(toolbarButtonClicked:) keyCode:0x2E isToggleable:NO];
-//                UIBarButtonItem *flexibleSpace = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemFlexibleSpace target:nil action:nil];
-//                
-//                [customToolbarView setItems:[NSArray arrayWithObjects:doneBarButton, windowsBarButton, escapeBarButton, tabBarButton, shiftBarButton, controlBarButton, altBarButton, deleteBarButton, flexibleSpace, nil]];
-//                keyInputField.inputAccessoryView = customToolbarView;
-//#endif
-//                [keyInputField becomeFirstResponder];
-//                [keyInputField addTarget:self action:@selector(onKeyboardPressed:) forControlEvents:UIControlEventEditingChanged];
-//                
-//                // Undo causes issues for our state management, so turn it off
-//                [keyInputField.undoManager disableUndoRegistration];
-//                
-//                isInputingText = true;
-//            }
-//        }
+        //if ([[event allTouches] count] == 3) [self toggleKeyboard];
     }
 }
 
diff --git a/Limelight/ViewControllers/StreamFrameViewController.m b/Limelight/ViewControllers/StreamFrameViewController.m
index a02ffac3..e6065b96 100644
--- a/Limelight/ViewControllers/StreamFrameViewController.m
+++ b/Limelight/ViewControllers/StreamFrameViewController.m
@@ -137,8 +137,8 @@
     //_exitSwipeRecognizer.edges = UIRectEdgeLeft;
     _exitSwipeRecognizer.delaysTouchesBegan = NO;
     _exitSwipeRecognizer.delaysTouchesEnded = NO;
-    
     [self.view addGestureRecognizer:_exitSwipeRecognizer];
+    
 #endif
     
     _tipLabel = [[UILabel alloc] init];
@@ -147,7 +147,7 @@
 #if TARGET_OS_TV
     [_tipLabel setText:@"Tip: Tap the Play/Pause button on the Apple TV Remote to disconnect from your PC"];
 #else
-    [_tipLabel setText:@"Tip: Swipe from the left edge to disconnect from your PC"];
+    [_tipLabel setText:@"Tip: Swipe from the left edge to the middle of your screen to disconnect from your PC"];
 #endif
     
     [_tipLabel sizeToFit];
diff --git a/README.md b/README.md
index fd9e3fcb..3ce9fb7e 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
 
 2023年12月， 阿西西的日常首先在iOS Moonlight上实现了多点触控，当时我在他的QQ群里承担了大部分iOS版的测试。
 
-2024年4月，我尝试解决了一个奇怪的多点触控bug, 第一次可以正常使用多点触控。
+2024年4月，我尝试解决了一个因pointer ID重复导致的奇怪bug, 第一次可以正常使用多点触控。
 
 安装 release 中的 ipa 文件，需要先对文件进行自签名，或者先越狱、安装巨魔商店。
 
@@ -18,7 +18,7 @@ This is the first fork published that actually works properly in native multi-po
 
 In Dec. 2023 阿西西的日常 was the first developer to implement native multi-touch passthrough on iOS while I undertook most part of testing for the modified iOS moonlight in his QQ group. 
 
-In Apr. 2024, I managed to fix a weird native-touch bug making it able to work properly in native-touch passthrough for the first time.
+In Apr. 2024, I managed to fix a weird bug caused by pointer ID repetition making it able to work properly in native-touch passthrough for the first time.
 
 To install the ipa file in release, you need to find a way to sideload the app on iOS, or try to jaibreak or install trollstore.