Temporary partial support for UTF-8.
Formatting.
Cleanup.
Updated TODO.