trying to fix track number counters. Some success