fixed tracking issues, finally