Translated some more...
Removed TODO.