Made utility functions work a little better and fixed some problems with GeoData class