added some location features
made various changes