@eugene-d  - there's quite a big change here. Instead of inserting the extra leaflet fields at each update we do the common ones at the start, then just the location/orientation ones.

Do you see any problem with this?