fixed misc duplications