the charset is unicode now
minor fixes