@Poppasketti, do you plan on fixing the editing error in the throne room fight?
This is actually quite an easy fix that I managed to do myself. All you have to do is remove the swing that Rey does with her lightsaber. You can see the guard’s weapon during her attack. It’s when her body covers it up that it vanishes behind her. So if you simply excise the part where you can see the guard’s weapon (during her swing), you can assume that the guard dropped it while they were fighting offscreen.