fixed population bugs
merged