I have reorganized the way intervals are updated - now it is done with the specific macro. Closes #52