added some preliminary unicode support