RiffTrack logic improvements