fix some bug and add limit for every person