Yes, those would be good additions I think.
On another note, I was watching the final scene of the film and wondered if anyone had tried removing the old woman and Rey’s dialogue to make it an entirely dialogue-free scene in line with other Star Wars endings. Rey would just stand up after burying the lightsabers, drawn to perhaps a sound effect or whisper, and see the ghosts in the distance.