Fixed problems with UTF-8 encoding + minor changes

Also changed some URIs in the export.