corrected some violations