More locations, fix some responsiveness