Updated TODO; updated some clock stuff