fixed some track linking issues