moved stuff around
added new tracked intervals
removed som unused vars