Re-init tracking matrices on gaps and clips
Add/Cleanup some comments