some violations fixed.