Updated TODO, edited documentation section