More bugfixes. Issue introduced with multiple names not correctly duplicating.