Fix uniquification a little bit

Layer name uniquification still has a few bugs... see #10