Fixing Bugss
GeoShape functionality