UserTrackMixin -> TrackMixin
Some sundry changes/fixes