Fix bugs in tracker and add m87