Unicode stuff

Split into 2 files, fixed unicode issues