added some features
added a location lookup