Changed how the UsageStats signal is handled
Fix incorrect comment
Tracker finished, but may be improved later