Cleaned up Ben's messy whitespace
Merge in master. Tweek events index ordering