diff --git a/Frontend/library/src/Inputs/FakeTouchController.ts b/Frontend/library/src/Inputs/FakeTouchController.ts
index 21d63ad9..3be346f1 100644
--- a/Frontend/library/src/Inputs/FakeTouchController.ts
+++ b/Frontend/library/src/Inputs/FakeTouchController.ts
@@ -72,7 +72,7 @@ export class FakeTouchController implements ITouchController {
      * @param touch - the activating touch event
      */
     onTouchStart(touch: TouchEvent): void {
-        if (!this.videoElementProvider.isVideoReady()) {
+        if (!this.videoElementProvider.isVideoReady() || touch.target !== this.videoElementProvider.getVideoElement()) {
             return;
         }
         if (this.fakeTouchFinger == null) {
@@ -108,7 +108,7 @@ export class FakeTouchController implements ITouchController {
      * @param touchEvent - the activating touch event
      */
     onTouchEnd(touchEvent: TouchEvent): void {
-        if (!this.videoElementProvider.isVideoReady()) {
+        if (!this.videoElementProvider.isVideoReady() || this.fakeTouchFinger == null) {
             return;
         }
         const videoElementParent =
@@ -144,7 +144,7 @@ export class FakeTouchController implements ITouchController {
      * @param touchEvent - the activating touch event
      */
     onTouchMove(touchEvent: TouchEvent): void {
-        if (!this.videoElementProvider.isVideoReady()) {
+        if (!this.videoElementProvider.isVideoReady() || this.fakeTouchFinger == null) {
             return;
         }
         const toStreamerHandlers =
diff --git a/Frontend/library/src/PeerConnectionController/PeerConnectionController.ts b/Frontend/library/src/PeerConnectionController/PeerConnectionController.ts
index 4034d5f4..99c2bd71 100644
--- a/Frontend/library/src/PeerConnectionController/PeerConnectionController.ts
+++ b/Frontend/library/src/PeerConnectionController/PeerConnectionController.ts
@@ -180,7 +180,7 @@ export class PeerConnectionController {
             this.onVideoStats(this.aggregatedStats);
 
             // Update the preferred codec selection based on what was actually negotiated
-            if (this.updateCodecSelection) {
+            if (this.updateCodecSelection && !!this.aggregatedStats.inboundVideoStats.codecId) {
                 this.config.setOptionSettingValue(
                     OptionParameters.PreferredCodec,
                     this.aggregatedStats.codecs.get(
@@ -370,7 +370,7 @@ export class PeerConnectionController {
         if (RTCRtpReceiver.getCapabilities && this.preferredCodec != '') {
             for (const transceiver of this.peerConnection?.getTransceivers() ?? []) {
                 if (
-                    transceiver &&  
+                    transceiver &&
                     transceiver.receiver &&
                     transceiver.receiver.track &&
                     transceiver.receiver.track.kind === 'video' &&
diff --git a/Frontend/library/src/WebRtcPlayer/WebRtcPlayerController.ts b/Frontend/library/src/WebRtcPlayer/WebRtcPlayerController.ts
index f45a6aeb..390d701e 100644
--- a/Frontend/library/src/WebRtcPlayer/WebRtcPlayerController.ts
+++ b/Frontend/library/src/WebRtcPlayer/WebRtcPlayerController.ts
@@ -1801,7 +1801,7 @@ export class WebRtcPlayerController {
         );
 
         this.streamMessageController.toStreamerHandlers.get(
-            'Command'
+            'UIInteraction'
         )([JSON.stringify(descriptor)]);
     }
 
diff --git a/README.md b/README.md
index 1e2e36cf..218b5e40 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@ The Pixel Streaming Infrastructure contains reference implementations for all th
   - shared libraries for [communication](Frontend/library/) and [UI](Frontend/ui-library/) functionality
   - separate [implementations](Frontend/implementations/) using different techologies such as TypeScript or React/JSX
 
-  For detailed information, see the [frontend readme](Frontend/README.md).
+  For detailed information, see the [/frontend](/Frontend/).
 
 ## Releases
 We release a number of different components under this repository, specifically:
@@ -64,7 +64,7 @@ npm i @epicgames-ps/lib-pixelstreamingfrontend-ui-ue5.3
 
 ## Documentation 
 * [General Docs](/Docs/README.md)
-* [Frontend Docs](/Frontend/Docs/README.md)
+* [Frontend Docs](/Frontend/)
 * Signalling Server Docs [TO DO](https://github.com/EpicGames/PixelStreamingInfrastructure/issues/255)
 * Matchmaker Docs [TO DO](https://github.com/EpicGames/PixelStreamingInfrastructure/issues/256)
 * SFU Docs [TO DO](https://github.com/EpicGames/PixelStreamingInfrastructure/issues/257)
diff --git a/SFU/Docs/What is the SFU.md b/SFU/Docs/What is the SFU.md
index e2791912..7f735a1a 100644
--- a/SFU/Docs/What is the SFU.md	
+++ b/SFU/Docs/What is the SFU.md	
@@ -32,8 +32,8 @@ Adding the above to your level blueprint lets you use the assigned key as a conn
 **Note:** The SFU is designed to automatically switch peers between layers based on their connection, so using this blueprint isn’t required for actual deployments.
 
 
-![Layer1](images/Layer1.png) Layer 1 
+![Layer1](images/Layer1.PNG) Layer 1 
 
-![Layer2](images/Layer2.png) Layer 2 
+![Layer2](images/Layer2.PNG) Layer 2 
 
-![Layer3](images/Layer3.png) Layer 3 
\ No newline at end of file
+![Layer3](images/Layer3.PNG) Layer 3 
\ No newline at end of file