Add uniquify + update comments