made things a little more unicodey
serious unicode issues, needs resolving