Solved problems.
Fixed TODOs.