Fixed warnings.
Added TODO.