added more rules, and stuff