adjustments for event fireing more than once
trying to fix event recursive issue
Changing geolocation code
merge in upstream