after the (IMO) 'silly' tie battle when they escape the death star are you leaving in the comment where Leia suspects the empire is tracking them? as this is a major plot hole as well.
as far as I'm concerned you can edit away to your hearts content as the SE is already a 'sows ear' so perhaps you could turn it into a 'silk purse'