change some of the rulesets for a more intuitive(?) behaviour