Major fix for Interval and Note classes