removed TODO's that are done. modified one for additional info