Fixed more bugs wit the rules