More unicode fixes. and cleanup.