Fixed support for GeoJSON features and feature collections, plus some tidy-up