fixes to make the locationChanged actually work