added stuff to TODO