Fixing 'order same' and cleanup
First draft of geolocation