Minor changes to count nr of people