added current location & minor changes to algorithm

need to test if fully scalable