Added more rules + removed bugs