Improving performance, fixing map marker bug