Import utility working
Import tweaks - fix fake duplicates etc

Also added more detail attributes to various entities