removed some TODO's
added TODO's