fixes
add general rules, which we discussed over email