fix up geojson stuff...
bit of refacotring