utf8 goes in separate file, not here [at all] more changes for 2.1