Fix some stuff that was broken
Do first steps to make intervals mandatory