Small fixes and initial work for different intervals