added location features not thoroughly tested yet