Added geo location; some fixes