Remove junk
Add unicode support.
Fix some test issues.