Reactivity adjustments and location bug fix