Okay. Well maybe others could chime in and provide their two cents, but I think what you’ve sent me will be great to start with!
I went back and skimmed through Ady’s post regarding the ROTJ source and you can tell he’s putting a lot of work to make the best template possible for Revisited with a combination of different sources. Seems like there’s an issue with every source.