fixed some rules