fixed esri and some tidying tweaks