Added a new solving rule for groups of choies, fixed some bugs