Fixed a bug where surface resample gets called incorrectly; added code to aggregate polygons in surface plots.