Minor fixes 

- Ditch the IntervalTree for something stupid (but faster) 
- ints instead of longs (we’ll fix it when we need it)