fixes
some more rules
changes in rules
change in order of elements