Added TODO and cleaned some docs