add party count and fix some bug