Factory visitors: do you concur?

Went to use my souvenir notebook today and the map of the factory precinct caught my eye... I went to Maranello twice this year and I'm sure the map has some things incorrectly placed. Those of you who have the notebook, see what you think:

Position 3 (wind tunnel) is on the wrong side of the Viale E. Ferrari - it's actually opposite the Meccanica, not beside (the building is correctly named in Italian, but the code is in the wrong place).

Position 14 (galleria) is shown on the wrong side of Viale A. Ferrari (should be opposite and other end of the block)

Position 15 (shop) is shown on the wrong corner (it's shown where Ristorante Cavallino is, should be other side of the road)

No big deal but just seems odd to not get such simple details correct?

Also, on my tour the highlight was seeing the Clienti F1 garage housing privately owned F1 cars (going back to the 60s). This is not to be confused with the FXX Clienti garage. My friend who did the tour some months later swears he didn't get to see this (and I can't imagine he'd not notice!) Has anyone else seen / not seen this and can you pinpoint it on the map? I recollect it (just a shed, not a display) being nearby the F1 engine shop around via Lauda / via Surtees?