Responding to feedback

- Simplifying the track generator
- Handling deletions correctly
- Improving comments