Barbar Jinks: Something like that could work - would have to make sure Wattoo and Anakin aren't in the shot though
shanerjedi: Yep, I just didn't have the skills to attempt removing Qui-Gon calling him Anakin - it would obviously have to go. Also, I'm with you on the Greedo issue - In an actual edit I would leave the Rodian's unsubtitled so it's easier for him to be a random Rodian
Also, back on the lightsaber reveal and how to make it work better... maybe if it was cut before Anakin turns around, but somekind of fanfare was added to the soundtrack at that point, like what it has in the theatrical cut - also let Qui-Gon say his bit like he would in the original cut of the scene as well and add the lightsaber reveal after he finishes talking.