Some negatives issues fixed