Various corrections

Fixed a few encoding issues, idot namespace (which now resolve) and idot:primarySource usage.