more rules and corrections
updated rules files