In regards to the planet the Death Star orbits:
I always felt it could just as well be Endor, as a sort of "Area 51" where the Empire constructs it's more secret projects. If so, it would be a way of tying ANH to JEDI in a more story-esque way than simply the script ripping and editing techniques.