fixed some things in tracking