Added geohash, enhanced parsing