Hi! Since you requested a review, I looked over your changes here. From what I can tell, there are no problems! There are indeed lots of relations involved, though, so perhaps a more experienced mapper can chime in.
Thanks for your contributions! (And nice job on this edit. I've briefly tried Vespucci, I feel like an edit like this one is quite the feat on a smartphone! Haha.)