added some stuff to TODO