Deduplication, bugfixes & translation