Updates to files
Fixed tracking bug