switch to UTF-8-UNIX encoding and fix a couple of minor things.