Fix crashing bug
Oh yeah, and add geographical coordinates