fixed TODO's