More TODO reduction.
Fixed compiler errors in the past few commits.
More compiler error fixes.