#TIP: when a drive through goes under a roof, I usually separate the roof section from the building, then add layer=1 to the building=roof. 

The rest of your edits looks great.
            ---
            
            Published using OSMCha: https://osmcha.org/changesets/169689339
            