updated and added TODO tags